mirror of
				https://github.com/ScoopInstaller/Main.git
				synced 2025-11-04 07:41:20 +00:00 
			
		
		
		
	Add $global to appdir calls (#3227)
This commit is contained in:
		
							parent
							
								
									f4a53c6951
								
							
						
					
					
						commit
						84c1f182be
					
				@ -30,6 +30,6 @@
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "env_set": {
 | 
					    "env_set": {
 | 
				
			||||||
        "BAZEL_SH": "$(appdir msys2)\\current\\usr\\bin\\bash.exe"
 | 
					        "BAZEL_SH": "$(appdir msys2 $global)\\current\\usr\\bin\\bash.exe"
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -9,7 +9,7 @@
 | 
				
			|||||||
        "url": "https://curl.haxx.se/docs/caextract.html",
 | 
					        "url": "https://curl.haxx.se/docs/caextract.html",
 | 
				
			||||||
        "re": "cacert-([\\d-]{10}).pem"
 | 
					        "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": {
 | 
					    "autoupdate": {
 | 
				
			||||||
        "url": "https://curl.haxx.se/ca/cacert-$version.pem#/cacert.pem"
 | 
					        "url": "https://curl.haxx.se/ca/cacert-$version.pem#/cacert.pem"
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
				
			|||||||
@ -22,14 +22,14 @@
 | 
				
			|||||||
    "persist": "$dir/lynx.cfg",
 | 
					    "persist": "$dir/lynx.cfg",
 | 
				
			||||||
    "pre_install": [
 | 
					    "pre_install": [
 | 
				
			||||||
        "$q = [char]34",
 | 
					        "$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\"",
 | 
					        "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 %*\""
 | 
					        "set-content \"$dir/lynx.cmd\" -value \"@$q$dir\\lynx.exe$q --cfg=$q$dir\\lynx.cfg$q %*\""
 | 
				
			||||||
    ],
 | 
					    ],
 | 
				
			||||||
    "post_install": [
 | 
					    "post_install": [
 | 
				
			||||||
        "if (Test-Path \"$(appdir openssl)/current/libcrypto-1_1,1.dll\") {",
 | 
					        "if (Test-Path \"$(appdir openssl $global)/current/libcrypto-1_1,1.dll\") {",
 | 
				
			||||||
        "   cp \"$(appdir openssl)/current/libcrypto-1_1,1.dll\" \"$dir/libcrypto-1_1,1.dll\"",
 | 
					        "   cp \"$(appdir openssl $global)/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\"",
 | 
					        "   cp \"$(appdir openssl $global)/current/libssl-1_1,1.dll\" \"$dir/libssl-1_1,1.dll\"",
 | 
				
			||||||
        "} else {",
 | 
					        "} else {",
 | 
				
			||||||
        "   echo 'lynx requires the 32-bit version of openssl to be installed'",
 | 
					        "   echo 'lynx requires the 32-bit version of openssl to be installed'",
 | 
				
			||||||
        "   exit 1",
 | 
					        "   exit 1",
 | 
				
			||||||
 | 
				
			|||||||
@ -14,7 +14,7 @@
 | 
				
			|||||||
    },
 | 
					    },
 | 
				
			||||||
    "bin": "wget.exe",
 | 
					    "bin": "wget.exe",
 | 
				
			||||||
    "depends": "cacert",
 | 
					    "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",
 | 
					    "checkver": "<title>GNU Wget ([\\d.]+) for Windows",
 | 
				
			||||||
    "autoupdate": {
 | 
					    "autoupdate": {
 | 
				
			||||||
        "architecture": {
 | 
					        "architecture": {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user