diff --git a/ack.json b/ack.json index 2581cf86ef..d76afa7b0e 100644 --- a/ack.json +++ b/ack.json @@ -6,7 +6,7 @@ "hash": "fd0617585b88517a3d41d3d206c1dc38058c57b90dfd88c278049a41aeb5be38", "bin": "ack.bat", "depends": "perl", - "pre_install": "Set-Content -Value '@perl.exe %~dp0ack-single-file %*' -Path $dir\\ack.bat", + "pre_install": "Set-Content -Value '@perl.exe %~dp0ack-single-file %*' -Path \"$dir\\ack.bat\"", "checkver": { "url": "https://beyondgrep.com/install/", "re": "The current stable version of ack is version ([\\d.]+)," diff --git a/bzip2.json b/bzip2.json index 0f2cca63fc..0612ed56e9 100644 --- a/bzip2.json +++ b/bzip2.json @@ -17,6 +17,6 @@ "bzip2.exe", "bzip2recover.exe" ], - "pre_install": "cp $dir\\bzip2.exe $dir\\bunzip2.exe; cp $dir\\bzip2.exe $dir\\bzcat.exe", + "pre_install": "cp \"$dir\\bzip2.exe\" \"$dir\\bunzip2.exe\"; cp \"$dir\\bzip2.exe\" \"$dir\\bzcat.exe\"", "checkver": "The current version is ([\\d.]+)" } diff --git a/composer.json b/composer.json index 428affa03e..1fce8daeee 100644 --- a/composer.json +++ b/composer.json @@ -10,8 +10,8 @@ }, "env_add_path": "home\\vendor\\bin", "pre_install": " - echo 'if($args -eq \"selfupdate\" -or $args -eq \"self-update\") { & scoop update composer }' | out-file $dir\\composer.ps1 - echo 'else { & php (join-path \"$psscriptroot\" \"composer.phar\") @args }' | out-file $dir\\composer.ps1 -append + echo 'if($args -eq \"selfupdate\" -or $args -eq \"self-update\") { & scoop update composer }' | out-file \"$dir\\composer.ps1\" + echo 'else { & php (join-path \"$psscriptroot\" \"composer.phar\") @args }' | out-file \"$dir\\composer.ps1\" -append ", "post_install": " $och = \"$env:APPDATA\\Composer\" diff --git a/dosbox.json b/dosbox.json index c2a19a12ae..1e6ecb8971 100644 --- a/dosbox.json +++ b/dosbox.json @@ -7,7 +7,7 @@ "installer": { "args": [ "/S", - "/D=$dir" + "/D=\"$dir\"" ] }, "bin": [ diff --git a/erlang.json b/erlang.json index b088c5777d..85d3741dec 100644 --- a/erlang.json +++ b/erlang.json @@ -23,7 +23,7 @@ "installer": { "args": [ "/S", - "/D=$dir" + "/D=\"$dir\"" ] }, "uninstaller": { diff --git a/git-up.json b/git-up.json index a9aaed2f4b..b9b3fcc5f0 100644 --- a/git-up.json +++ b/git-up.json @@ -7,7 +7,7 @@ "extract_dir": "PyGitUp-1.4.6", "depends": "python", "post_install": " - pushd $dir + pushd \"$dir\" try { scoop reset python iex \"$(scoop which python) setup.py install\" diff --git a/haskell.json b/haskell.json index 3d0a11999d..cb286faad2 100644 --- a/haskell.json +++ b/haskell.json @@ -8,7 +8,10 @@ } }, "installer": { - "args": "/S /D=$dir" + "args": [ + "/S", + "/D=\"$dir\"" + ] }, "uninstaller": { "file": "Uninstall.exe", diff --git a/jetbrains-toolbox.json b/jetbrains-toolbox.json index d4c308707b..d10491352f 100644 --- a/jetbrains-toolbox.json +++ b/jetbrains-toolbox.json @@ -7,7 +7,7 @@ "installer": { "args": [ "/S", - "/D=$dir" + "/D=\"$dir\"" ] }, "uninstaller": { diff --git a/julia.json b/julia.json index 21906728fc..35b3f8d66f 100644 --- a/julia.json +++ b/julia.json @@ -16,7 +16,7 @@ "file": "julia-installer.exe", "args": [ "/S", - "/D=$dir" + "/D=\"$dir\"" ] }, "uninstaller": { diff --git a/llvm.json b/llvm.json index 69772d8060..0bab440db1 100644 --- a/llvm.json +++ b/llvm.json @@ -13,7 +13,10 @@ } }, "installer": { - "args": "/S /D=$dir" + "args": [ + "/S", + "/D=\"$dir\"" + ] }, "uninstaller": { "file": "Uninstall.exe", diff --git a/lynx.json b/lynx.json index fa500d20e3..b263262465 100644 --- a/lynx.json +++ b/lynx.json @@ -6,6 +6,6 @@ "hash": "552bc68afd2ff9a5de88f26d76f55dd8697cf6082c6afb01b3d1a9942f4d3ee0", "bin": "lynx.ps1", "pre_install": " - \"$dir\\lynx.exe --cfg=$dir\\lynx.cfg\" | out-file -enc oem $dir\\lynx.ps1 + \"\\\"$dir\\lynx.exe\\\" --cfg=\\\"$dir\\lynx.cfg\\\"\" | out-file -enc oem \"$dir\\lynx.ps1\" " } diff --git a/nano.json b/nano.json index ffcd95105d..7b3c064a2b 100644 --- a/nano.json +++ b/nano.json @@ -6,7 +6,7 @@ "hash": "c012456b9f29e488b0e9a688aa43a34326dd573f9e99765cbdac2b81a4bc1060", "bin": "nano.exe", "extract_dir": "nano-2.5.3-win32", - "post_install": "if (-not (Test-Path ~/nano.rc)) { Copy-Item $dir/nano.rc ~/nano.rc }", + "post_install": "if (-not (Test-Path ~/nano.rc)) { Copy-Item \"$dir/nano.rc\" ~/nano.rc }", "checkver": "Latest Version\\s+([\\d.]+)", "notes": " You can configure nano editor by editing the configuration file nano.rc diff --git a/nim.json b/nim.json index 5d582dfb5c..b133afb589 100644 --- a/nim.json +++ b/nim.json @@ -16,7 +16,7 @@ "extract_dir": "nim-0.17.2", "post_install": " # Copy Nimble package - Copy-Item -Recurse $dir\\dist\\nimble\\src\\nimblepkg $dir\\bin + Copy-Item -Recurse \"$dir\\dist\\nimble\\src\\nimblepkg\" \"$dir\\bin\" ", "bin": [ "bin\\c2nim.exe", diff --git a/nmap.json b/nmap.json index 09e77190c2..70c486822f 100644 --- a/nmap.json +++ b/nmap.json @@ -6,7 +6,10 @@ "hash": "5dbe89981a8d567e5b9b935fbf8019885e7347f45c5af69cab21e8dcafee3393", "extract_dir": "nmap", "installer": { - "args": "/S /D=$dir" + "args": [ + "/S", + "/D=\"$dir\"" + ] }, "uninstaller": { "file": "Uninstall.exe", diff --git a/node-chakracore.json b/node-chakracore.json index 7c1a799b49..27cd7fe004 100644 --- a/node-chakracore.json +++ b/node-chakracore.json @@ -24,7 +24,7 @@ ], "post_install": " # Set npm prefix to install modules inside bin and npm cache so they persist - Set-Content -Value \"prefix=$persist_dir\\bin`ncache=$persist_dir\\cache\" -Path $dir\\node_modules\\npm\\npmrc + Set-Content -Value \"prefix=\\\"$persist_dir\\bin\\\"`ncache=\\\"$persist_dir\\cache\\\"\" -Path \"$dir\\node_modules\\npm\\npmrc\" ", "checkver": { "url": "https://nodejs.org/download/chakracore-release/index.json", diff --git a/nodejs-lts.json b/nodejs-lts.json index c795851b39..d8d312b7bd 100644 --- a/nodejs-lts.json +++ b/nodejs-lts.json @@ -24,7 +24,7 @@ ], "post_install": " # Set npm prefix to install modules inside bin and npm cache so they persist - Set-Content -Value \"prefix=$persist_dir\\bin`ncache=$persist_dir\\cache\" -Path $dir\\node_modules\\npm\\npmrc + Set-Content -Value \"prefix=\\\"$persist_dir\\bin\\\"`ncache=\\\"$persist_dir\\cache\\\"\" -Path \"$dir\\node_modules\\npm\\npmrc\" ", "checkver": { "url": "https://nodejs.org/en/download/", diff --git a/nodejs.json b/nodejs.json index 2536d0cc49..c7cc1d936a 100644 --- a/nodejs.json +++ b/nodejs.json @@ -24,7 +24,7 @@ ], "post_install": " # Set npm prefix to install modules inside bin and npm cache so they persist - Set-Content -Value \"prefix=$persist_dir\\bin`ncache=$persist_dir\\cache\" -Path $dir\\node_modules\\npm\\npmrc + Set-Content -Value \"prefix=\\\"$persist_dir\\bin\\\"`ncache=\\\"$persist_dir\\cache\\\"\" -Path \"$dir\\node_modules\\npm\\npmrc\" ", "checkver": { "url": "https://nodejs.org/dist/latest/", diff --git a/nvm.json b/nvm.json index 7ab87c75bb..2233a3d7af 100644 --- a/nvm.json +++ b/nvm.json @@ -26,12 +26,12 @@ "architecture": { "64bit": { "pre_install": "if(!(test-path \"$dir\\settings.txt\")) { - write-output \"root: $persist_dir\\nodejs`r`narch: 64`r`nproxy: none\" | Out-File -encoding \"ASCII\" $dir\\settings.txt + write-output \"root: $persist_dir\\nodejs`r`narch: 64`r`nproxy: none\" | Out-File -encoding \"ASCII\" \"$dir\\settings.txt\" }" }, "32bit": { "pre_install": "if(!(test-path \"$dir\\settings.txt\")) { - write-output \"root: $persist_dir\\nodejs`r`narch: 32`r`nproxy: none\" | Out-File -encoding \"ASCII\" $dir\\settings.txt + write-output \"root: $persist_dir\\nodejs`r`narch: 32`r`nproxy: none\" | Out-File -encoding \"ASCII\" \"$dir\\settings.txt\" }" } }, diff --git a/perl.json b/perl.json index 89d1a7921f..2d3b7a4dd5 100644 --- a/perl.json +++ b/perl.json @@ -16,7 +16,7 @@ # enable standard idiomatic access to user's home directory ## remove HomeDir section from portable.perl (disables Portable.pm override of File::HomeDir) ## NOTE: conversion to byte[] avoids adding an extra trailing newline to the output file - [byte[]][char[]]((Get-Content -raw $dir\\portable.perl) -replace \"(?ms)^HomeDir:.*?^(?=\\S)\",\"\") | Set-Content $dir\\portable.perl -encoding byte + [byte[]][char[]]((Get-Content -raw \"$dir\\portable.perl\") -replace \"(?ms)^HomeDir:.*?^(?=\\S)\",\"\") | Set-Content \"$dir\\portable.perl\" -encoding byte ", "env_add_path": [ "perl\\site\\bin", diff --git a/r.json b/r.json index 1b390955d1..46809aa46e 100644 --- a/r.json +++ b/r.json @@ -6,12 +6,12 @@ "64bit": { "url": "https://cran.rstudio.com/bin/windows/base/R-3.4.3-win.exe", "hash": "7d46cd1de979cd0ef1a6e8de0e1a35223d1304d8953e4cd0d414153852ce684b", - "pre_install": "copy-item -recurse $dir\\bin\\x64 $dir\\bin\\curr_arch" + "pre_install": "copy-item -recurse \"$dir\\bin\\x64\" \"$dir\\bin\\curr_arch\"" }, "32bit": { "url": "https://cran.rstudio.com/bin/windows/base/R-3.4.3-win.exe", "hash": "7d46cd1de979cd0ef1a6e8de0e1a35223d1304d8953e4cd0d414153852ce684b", - "pre_install": "copy-item -recurse $dir\\bin\\i386 $dir\\bin\\curr_arch" + "pre_install": "copy-item -recurse \"$dir\\bin\\i386\" \"$dir\\bin\\curr_arch\"" } }, "innosetup": true, diff --git a/ruby19.json b/ruby19.json index 843fafc8ea..a8c67db11f 100644 --- a/ruby19.json +++ b/ruby19.json @@ -15,7 +15,7 @@ "devkit" ], "env_add_path": "bin", - "post_install": "pushd $dir\\devkit;ruby dk.rb init > $null;echo \"- $dir\" | out-file config.yml -a -enc default; ruby dk.rb install;popd;", + "post_install": "pushd \"$dir\\devkit\";ruby dk.rb init > $null;echo \"- $dir\" | out-file config.yml -a -enc default; ruby dk.rb install;popd;", "checkver": { "url": "https://bintray.com/package/generalTab?pkgPath=/oneclick/rubyinstaller/rubyinstaller", "re": "rubyinstaller/(1.9[\\d.]+-p[\\d]+)" diff --git a/smartmontools.json b/smartmontools.json index 3accfeaa54..08aa1c08c1 100644 --- a/smartmontools.json +++ b/smartmontools.json @@ -17,7 +17,7 @@ "installer": { "args": [ "/S", - "/D=$dir" + "/D=\"$dir\"" ] }, "checkver": { diff --git a/unrar.json b/unrar.json index 03ac7b006d..33a0935925 100644 --- a/unrar.json +++ b/unrar.json @@ -8,7 +8,7 @@ "installer": { "args": [ "-s", - "-d$dir" + "-d\"$dir\"" ] }, "checkver": { diff --git a/wget.json b/wget.json index 2833279eaa..dd476572b0 100644 --- a/wget.json +++ b/wget.json @@ -22,7 +22,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)\\current\\cacert.pem\" | out-file \"$dir\\wget.ini\" -encoding default", "checkver": "GNU Wget ([\\d.]+) for Windows", "autoupdate": { "architecture": {