From 84c1f182bea4b86d6c07aacc6f042ae8dd3e2eb5 Mon Sep 17 00:00:00 2001
From: Ross Smith II <ross@smithii.com>
Date: Mon, 18 Mar 2019 03:38:05 -0700
Subject: [PATCH] Add $global to appdir calls (#3227)

---
 bazel.json  | 2 +-
 cacert.json | 2 +-
 lynx.json   | 8 ++++----
 wget.json   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bazel.json b/bazel.json
index e07264f22b..7cf0a4105a 100644
--- a/bazel.json
+++ b/bazel.json
@@ -30,6 +30,6 @@
         }
     },
     "env_set": {
-        "BAZEL_SH": "$(appdir msys2)\\current\\usr\\bin\\bash.exe"
+        "BAZEL_SH": "$(appdir msys2 $global)\\current\\usr\\bin\\bash.exe"
     }
 }
diff --git a/cacert.json b/cacert.json
index 791aad03ac..6956ea1d9c 100644
--- a/cacert.json
+++ b/cacert.json
@@ -9,7 +9,7 @@
         "url": "https://curl.haxx.se/docs/caextract.html",
         "re": "cacert-([\\d-]{10}).pem"
     },
-    "post_install": "if (Test-Path \"$(appdir curl)\") {cp \"$dir\\cacert.pem\" \"$(appdir curl)\\current\\bin\\curl-ca-bundle.crt\"}",
+    "post_install": "if (Test-Path \"$(appdir curl $global)\") {cp \"$dir\\cacert.pem\" \"$(appdir curl $global)\\current\\bin\\curl-ca-bundle.crt\"}",
     "autoupdate": {
         "url": "https://curl.haxx.se/ca/cacert-$version.pem#/cacert.pem"
     }
diff --git a/lynx.json b/lynx.json
index 6bf4e1a784..ca6798c31b 100644
--- a/lynx.json
+++ b/lynx.json
@@ -22,14 +22,14 @@
     "persist": "$dir/lynx.cfg",
     "pre_install": [
         "$q = [char]34",
-        "add-content \"$dir/lynx.cfg\" -value \"SSL_CERT_FILE:$(appdir openssl)/current/cacert.pem`n\"",
+        "add-content \"$dir/lynx.cfg\" -value \"SSL_CERT_FILE:$(appdir openssl $global)/current/cacert.pem`n\"",
         "add-content \"$dir/lynx.cfg\" -value \"FORCE_SSL_PROMPT:PROMPT`n\"",
         "set-content \"$dir/lynx.cmd\" -value \"@$q$dir\\lynx.exe$q --cfg=$q$dir\\lynx.cfg$q %*\""
     ],
     "post_install": [
-        "if (Test-Path \"$(appdir openssl)/current/libcrypto-1_1,1.dll\") {",
-        "   cp \"$(appdir openssl)/current/libcrypto-1_1,1.dll\" \"$dir/libcrypto-1_1,1.dll\"",
-        "   cp \"$(appdir openssl)/current/libssl-1_1,1.dll\" \"$dir/libssl-1_1,1.dll\"",
+        "if (Test-Path \"$(appdir openssl $global)/current/libcrypto-1_1,1.dll\") {",
+        "   cp \"$(appdir openssl $global)/current/libcrypto-1_1,1.dll\" \"$dir/libcrypto-1_1,1.dll\"",
+        "   cp \"$(appdir openssl $global)/current/libssl-1_1,1.dll\" \"$dir/libssl-1_1,1.dll\"",
         "} else {",
         "   echo 'lynx requires the 32-bit version of openssl to be installed'",
         "   exit 1",
diff --git a/wget.json b/wget.json
index c7c24bc358..b5c4129b41 100644
--- a/wget.json
+++ b/wget.json
@@ -14,7 +14,7 @@
     },
     "bin": "wget.exe",
     "depends": "cacert",
-    "post_install": "\"ca_certificate=$(appdir cacert)\\current\\cacert.pem\" | out-file \"$dir\\wget.ini\" -encoding default",
+    "post_install": "\"ca_certificate=$(appdir cacert $global)\\current\\cacert.pem\" | out-file \"$dir\\wget.ini\" -encoding default",
     "checkver": "<title>GNU Wget ([\\d.]+) for Windows",
     "autoupdate": {
         "architecture": {