From 339115868d80aa05b1e3f20f3cf1b88cbc52d646 Mon Sep 17 00:00:00 2001 From: Ross Smith II Date: Sat, 7 Jul 2018 14:16:09 -0700 Subject: [PATCH] Change multiline strings to arrays (#2363) --- apache.json | 12 ++++++------ bfg.json | 6 +++--- busybox.json | 22 +++++++++++----------- git-up.json | 19 ++++++++++--------- git.json | 14 ++++++++------ go.json | 10 +++++----- gow.json | 14 +++++++------- haxe.json | 10 +++++----- inadyn-mt.json | 16 +++++++++------- jruby.json | 6 ++++-- mariadb.json | 6 ++---- mongodb.json | 10 +++++----- msmpi.json | 13 +++++++------ mysql.json | 20 ++++++++++---------- nano.json | 14 ++++++++------ nim.json | 8 ++++---- nssm.json | 6 ++++-- nvm.json | 20 +++++++++++++------- pester.json | 46 +++++++++++++++++++++++----------------------- php-nts.json | 30 +++++++++++++++--------------- php.json | 30 +++++++++++++++--------------- postgresql.json | 6 +++--- python-exp.json | 27 ++++++++++++++------------- r.json | 19 ++++++++++--------- rustup.json | 16 ++++++++-------- srvman.json | 6 ++++-- unbound.json | 10 +++++----- vim.json | 12 +++++++----- yarn.json | 10 +++++----- 29 files changed, 230 insertions(+), 208 deletions(-) diff --git a/apache.json b/apache.json index 137e3d7bd7..84a3224e54 100644 --- a/apache.json +++ b/apache.json @@ -29,12 +29,12 @@ "bin\\logresolve.exe", "bin\\rotatelogs.exe" ], - "post_install": " -# set directory in httpd.conf -$conf = \"$dir/conf/httpd.conf\" -$root=(scoop which httpd | split-path -res -par | split-path -par) -replace '\\\\', '/'; -(gc $conf) | % { $_ -replace 'c:/Apache24', \"$root\" } | sc $conf -", + "post_install": [ + "# set directory in httpd.conf", + "$conf = \"$dir/conf/httpd.conf\"", + "$root=(scoop which httpd | split-path -res -par | split-path -par) -replace '\\\\', '/';", + "(gc $conf) | % { $_ -replace 'c:/Apache24', \"$root\" } | sc $conf" + ], "checkver": { "url": "https://fossies.org/search?q=folder_search&q1=httpd&ad=%2Ffresh%2Fwindows%2Fwww&ca=yes&dp=1", "re": "httpd-([\\d.]+)-win64-VC15.zip" diff --git a/bfg.json b/bfg.json index dd4c1ec761..8eff31c4e0 100644 --- a/bfg.json +++ b/bfg.json @@ -11,9 +11,9 @@ ] }, "bin": "bfg.ps1", - "pre_install": " - write-output ('java -jar {0}\\bfg-{1}.jar $args' -f \"$dir\", \"$version\") | out-file -filepath $dir\\bfg.ps1 - ", + "pre_install": [ + "write-output ('java -jar {0}\\bfg-{1}.jar $args' -f \"$dir\", \"$version\") | out-file -filepath $dir\\bfg.ps1" + ], "checkver": { "url": "https://search.maven.org/solrsearch/select/?q=g:com.madgag+AND+a:bfg", "jp": "$.response.docs[0].latestVersion" diff --git a/busybox.json b/busybox.json index 455885609a..7e175c384b 100644 --- a/busybox.json +++ b/busybox.json @@ -26,17 +26,17 @@ } } }, - "post_install": " - if(!(test-path ~/.profile)) { - 'creating ~/.profile' -@\" -if [ -e ~/.bashrc ] -then - source ~/.bashrc -fi -\"@ | out-file -en oem ~/.profile - } - ", + "post_install": [ + "if(!(test-path ~/.profile)) {", + " 'creating ~/.profile'", + "@\"", + "if [ -e ~/.bashrc ]", + "then", + " source ~/.bashrc", + "fi", + "\"@ | out-file -en oem ~/.profile", + "}" + ], "bin": [ "busybox.exe", [ diff --git a/git-up.json b/git-up.json index 5faacdb39c..8a8c91a6c3 100644 --- a/git-up.json +++ b/git-up.json @@ -6,15 +6,16 @@ "hash": "d7db91bb8c5d5a5d4635dee380ed496ca6a7da9903504357b752e0b396da327c", "extract_dir": "PyGitUp-1.5.0", "depends": "python", - "post_install": " - pushd \"$dir\" - try { - scoop reset python - iex \"$(scoop which python) setup.py install\" - } - finally { - popd - }", + "post_install": [ + "pushd \"$dir\"", + "try {", + " scoop reset python", + " iex \"$(scoop which python) setup.py install\"", + "}", + "finally {", + " popd", + "}" + ], "checkver": "github", "autoupdate": { "url": "https://github.com/msiemens/PyGitUp/archive/v$version.zip", diff --git a/git.json b/git.json index c55465b2d3..7bf7a9fdfd 100644 --- a/git.json +++ b/git.json @@ -31,12 +31,14 @@ "post_install": [ "git config --global credential.helper manager" ], - "notes": "To get Git to recognise OpenSSH, you will need to run - -scoop install openssh -[environment]::setenvironmentvariable('GIT_SSH', (resolve-path (scoop which ssh)), 'USER') - -and then restart powershell.", + "notes": [ + "To get Git to recognise OpenSSH, you will need to run", + "", + "scoop install openssh", + "[environment]::setenvironmentvariable('GIT_SSH', (resolve-path (scoop which ssh)), 'USER')", + "", + "and then restart powershell." + ], "checkver": { "url": "https://github.com/git-for-windows/git/releases/latest", "re": "v(?[\\d\\w.]+)/PortableGit-(?[\\d.]+).*\\.exe" diff --git a/go.json b/go.json index db8e29fd61..75e8c7e8b7 100644 --- a/go.json +++ b/go.json @@ -41,9 +41,9 @@ "url": "$url.sha256" } }, - "notes": " - Your GOROOT has been set to: $dir - You can run 'go env GOROOT' to view this at any time. - \"$env:USERPROFILE\\go\\bin)\" has been added to your PATH. - " + "notes": [ + "Your GOROOT has been set to: $dir", + "You can run 'go env GOROOT' to view this at any time.", + "\"$env:USERPROFILE\\go\\bin)\" has been added to your PATH." + ] } diff --git a/gow.json b/gow.json index 30cbc304c9..651c0d6431 100644 --- a/gow.json +++ b/gow.json @@ -7,13 +7,13 @@ "url": "https://github.com/bmatzelle/gow/releases", "re": "Gow ([\\d.]+)" }, - "pre_install": " - \"@cscript //NoLogo \"\"$dir\\bin\\gow.vbs\"\" %1\" | Set-Content -force \"$dir\\bin\\gow.bat\" - ", - "post_install": " - # create etc directory (required by bash), if needed - if (! (test-path \"$dir\\etc\")) { new-item -itemtype directory \"$dir\\etc\" } - ", + "pre_install": [ + "\"@cscript //NoLogo \"\"$dir\\bin\\gow.vbs\"\" %1\" | Set-Content -force \"$dir\\bin\\gow.bat\"" + ], + "post_install": [ + "# create etc directory (required by bash), if needed", + "if (! (test-path \"$dir\\etc\")) { new-item -itemtype directory \"$dir\\etc\" }" + ], "bin": [ "bin\\awk.exe", "bin\\basename.exe", diff --git a/haxe.json b/haxe.json index 974eef1c71..403c92e8c9 100644 --- a/haxe.json +++ b/haxe.json @@ -12,11 +12,11 @@ "HAXEPATH": "$dir" }, "depends": "neko", - "pre_install": " - if(Test-Path \"$dir\\haxe_*\") { - Move-Item -Force \"$dir\\haxe_*\\*\" \"$dir\" - } - ", + "pre_install": [ + "if(Test-Path \"$dir\\haxe_*\") {", + " Move-Item -Force \"$dir\\haxe_*\\*\" \"$dir\"", + "}" + ], "checkver": { "github": "https://github.com/HaxeFoundation/haxe" }, diff --git a/inadyn-mt.json b/inadyn-mt.json index c3fd60ff0b..dbb4fada4c 100644 --- a/inadyn-mt.json +++ b/inadyn-mt.json @@ -14,13 +14,15 @@ ], "extract_dir": "inadyn-mt.v.02.28.10", "hash": "f69bea12d96b66f9f662a8df0730c60457b24f5fb5308b109936880ebf7be5ca", - "notes": "To install and run as a service: -> notepad $dir\\bin\\win32\\inadyn-mt.conf -> cd \"$dir\\bin\\win32\" -> sudo .\\inadyn-mt -i -> sudo .\\inadyn-mt -s - -For help, see $dir\\readme.html", + "notes": [ + "To install and run as a service:", + "> notepad $dir\\bin\\win32\\inadyn-mt.conf", + "> cd \"$dir\\bin\\win32\"", + "> sudo .\\inadyn-mt -i", + "> sudo .\\inadyn-mt -s", + "", + "For help, see $dir\\readme.html" + ], "persist": [ "bin/win32/inadyn-mt.conf", "bin/win32/inadyn-mt.log", diff --git a/jruby.json b/jruby.json index a94b2394c3..e8f74f1463 100644 --- a/jruby.json +++ b/jruby.json @@ -20,8 +20,10 @@ "java/openjdk" ] }, - "notes": "Install a JDK and set JAVA_HOME if you don't already have. JRuby won't work without it. -Also note that this installation overrides GEM_HOME and GEM_PATH from any previous Ruby or JRuby installation.", + "notes": [ + "Install a JDK and set JAVA_HOME if you don't already have. JRuby won't work without it.", + "Also note that this installation overrides GEM_HOME and GEM_PATH from any previous Ruby or JRuby installation." + ], "checkver": { "url": "http://jruby.org/download", "re": "Current Release:\\s+JRuby\\s+([\\d.]+)" diff --git a/mariadb.json b/mariadb.json index de9bf95e38..a8d46823a2 100644 --- a/mariadb.json +++ b/mariadb.json @@ -51,10 +51,8 @@ "if (!(Test-Path \"$dir\\data\\auto.cnf\")) { mysqld --initialize-insecure }" ], "notes": [ - "Run following command as administrator to run MariaDB as a service. -", - "mysqld --install \"[Service Name(default:MySQL)]\" -" + "Run following command as administrator to run MariaDB as a service.", + "mysqld --install \"[Service Name(default:MySQL)]\"" ], "checkver": { "url": "https://downloads.mariadb.org/", diff --git a/mongodb.json b/mongodb.json index 601781508c..889cd47032 100644 --- a/mongodb.json +++ b/mongodb.json @@ -22,11 +22,11 @@ "bin\\mongostat.exe", "bin\\mongotop.exe" ], - "post_install": " - # create initial directories - if(!(test-path 'C:\\data')) { mkdir 'C:\\data' > $null } - if(!(test-path 'C:\\data\\db')) { mkdir 'C:\\data\\db' > $null } - ", + "post_install": [ + "# create initial directories", + "if(!(test-path 'C:\\data')) { mkdir 'C:\\data' > $null }", + "if(!(test-path 'C:\\data\\db')) { mkdir 'C:\\data\\db' > $null }" + ], "checkver": { "url": "https://www.mongodb.com/download-center", "re": "Current Stable Release \\(([\\d.]+)\\)" diff --git a/msmpi.json b/msmpi.json index 68eb8abe58..a5e6b82974 100644 --- a/msmpi.json +++ b/msmpi.json @@ -11,12 +11,13 @@ "architecture": { "64bit": { "installer": { - "script": " - 7z x -r \"$dir\\tmp\\4.msi\" -o\"$dir\" - Remove-Item \"$dir\\msmpires.dll\" - Remove-Item \"$dir\\msmpi.dll\" - Rename-Item \"$dir\\msmpires64.dll\" \"$dir\\msmpires.dll\" - Rename-Item \"$dir\\msmpi64.dll\" \"$dir\\msmpi.dll\"" + "script": [ + "7z x -r \"$dir\\tmp\\4.msi\" -o\"$dir\"", + "Remove-Item \"$dir\\msmpires.dll\"", + "Remove-Item \"$dir\\msmpi.dll\"", + "Rename-Item \"$dir\\msmpires64.dll\" \"$dir\\msmpires.dll\"", + "Rename-Item \"$dir\\msmpi64.dll\" \"$dir\\msmpi.dll\"" + ] } }, "32bit": { diff --git a/mysql.json b/mysql.json index 328566cefd..847fa709ad 100644 --- a/mysql.json +++ b/mysql.json @@ -29,16 +29,16 @@ "persist": [ "data" ], - "post_install": " -#Initialize data directory (without generating root password) -if (!(Test-Path \"$dir\\data\\auto.cnf\")) { - mysqld --initialize-insecure -} -#Output client configuration to my.ini file so no username is required when connecting -echo \"\" | out-file \"$dir/my.ini\" -Encoding ASCII -Append -echo \"[client]\" | out-file \"$dir/my.ini\" -Encoding ASCII -Append -echo \"user=root\" | out-file \"$dir/my.ini\" -Encoding ASCII -Append -", + "post_install": [ + "#Initialize data directory (without generating root password)", + "if (!(Test-Path \"$dir\\data\\auto.cnf\")) {", + " mysqld --initialize-insecure", + "}", + "#Output client configuration to my.ini file so no username is required when connecting", + "echo \"\" | out-file \"$dir/my.ini\" -Encoding ASCII -Append", + "echo \"[client]\" | out-file \"$dir/my.ini\" -Encoding ASCII -Append", + "echo \"user=root\" | out-file \"$dir/my.ini\" -Encoding ASCII -Append" + ], "checkver": { "url": "https://dev.mysql.com/downloads/mysql/", "re": "

MySQL Community Server ([\\d.]+)" diff --git a/nano.json b/nano.json index 7b3c064a2b..e045f9aebc 100644 --- a/nano.json +++ b/nano.json @@ -6,11 +6,13 @@ "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 - in your home folder. For nano to find the configuration file, you will - need to set %HOME% environment variable to point to your home folder. - " + "notes": [ + "You can configure nano editor by editing the configuration file nano.rc", + "in your home folder. For nano to find the configuration file, you will", + "need to set %HOME% environment variable to point to your home folder." + ] } diff --git a/nim.json b/nim.json index 41a668edb2..348d15a58b 100644 --- a/nim.json +++ b/nim.json @@ -14,10 +14,10 @@ }, "depends": "gcc", "extract_dir": "nim-0.18.0", - "post_install": " - # Copy Nimble package - Copy-Item -Recurse \"$dir\\dist\\nimble\\src\\nimblepkg\" \"$dir\\bin\" - ", + "post_install": [ + "# Copy Nimble package", + "Copy-Item -Recurse \"$dir\\dist\\nimble\\src\\nimblepkg\" \"$dir\\bin\"" + ], "bin": [ "bin\\c2nim.exe", "bin\\makelink.exe", diff --git a/nssm.json b/nssm.json index d733f8e3b0..8a179b8673 100644 --- a/nssm.json +++ b/nssm.json @@ -33,6 +33,8 @@ } } }, - "notes": "Manage Services with NSSM (GUI based) (e.g., 'nssm install nginx' to install nginx as service gui will popup or 'nssm start/status/stop apache'). -Visit https://nssm.cc/commands for more info" + "notes": [ + "Manage Services with NSSM (GUI based) (e.g., 'nssm install nginx' to install nginx as service gui will popup or 'nssm start/status/stop apache').", + "Visit https://nssm.cc/commands for more info" + ] } diff --git a/nvm.json b/nvm.json index 2233a3d7af..f728d7d6ea 100644 --- a/nvm.json +++ b/nvm.json @@ -25,17 +25,23 @@ "hash": "975697d7a3ab697060fe71ffbb37dba7ff2120295ead3e75799f935ca7403135", "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\" - }" + "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\"", + "}" + ] }, "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\" - }" + "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\"", + "}" + ] } }, - "notes": "You'll need to restart powershell/cmd to have it reload Environment Variables so nvm will work correctly", + "notes": [ + "You'll need to restart powershell/cmd to have it reload Environment Variables so nvm will work correctly" + ], "autoupdate": { "url": "https://github.com/coreybutler/nvm-windows/releases/download/$version/nvm-noinstall.zip" } diff --git a/pester.json b/pester.json index ee6874073f..de37dbaa09 100644 --- a/pester.json +++ b/pester.json @@ -7,29 +7,29 @@ "hash": "34cabbfb33d46f9a91386308a3b86023af602845980b6c8507979db5c29214d0", "extract_dir": "pester-4.3.1", "bin": "bin\\pester.bat", - "post_install": " - $import = \"try { `$null = gcm pester -ea stop; import-module `\"$dir\\pester.psm1`\" } catch { }\" - - if($profile) { - 'adding pester to powershell profile...' - if(!(test-path $profile)) { - 'powershell profile doesn''t exist. creating...' - $profile_dir = split-path $profile - if(!(test-path $profile_dir)) { mkdir $profile_dir > $null } - '' > $profile - } - - $text = get-content $profile - if (($text | sls 'pester') -eq $null) { - $new_profile = @($text) + $import - $new_profile > $profile - success 'pester added to powershell profile.' - } - } else { warn 'no powershell profile found. the pester module will not be imported each session.' } - - 'importing pester for current session...' - iex \"$import\" - ", + "post_install": [ + "$import = \"try { `$null = gcm pester -ea stop; import-module `\"$dir\\pester.psm1`\" } catch { }\"", + "", + "if($profile) {", + " 'adding pester to powershell profile...'", + " if(!(test-path $profile)) {", + " 'powershell profile doesn''t exist. creating...'", + " $profile_dir = split-path $profile", + " if(!(test-path $profile_dir)) { mkdir $profile_dir > $null }", + " '' > $profile", + " }", + "", + " $text = get-content $profile", + " if (($text | sls 'pester') -eq $null) {", + " $new_profile = @($text) + $import", + " $new_profile > $profile", + " success 'pester added to powershell profile.'", + " }", + "} else { warn 'no powershell profile found. the pester module will not be imported each session.' }", + "", + "'importing pester for current session...'", + "iex \"$import\"" + ], "checkver": "github", "autoupdate": { "url": "https://github.com/pester/pester/archive/$version.tar.gz", diff --git a/php-nts.json b/php-nts.json index d797ece4dd..2df9e7f476 100644 --- a/php-nts.json +++ b/php-nts.json @@ -27,21 +27,21 @@ "env_set": { "PHP_INI_SCAN_DIR": "$dir\\cli;$dir\\cli\\conf.d;" }, - "post_install": " -# Copy ini scan dir from old location before persistent update -if ((Test-Path \"$dir\\..\\conf\") -and !(Test-Path \"$dir\\cli\\conf.d\")) { - Write-Host -ForegroundColor Cyan \"We are moving your php configuration to $dir\\cli\\conf.d\" - Move-Item \"$dir\\..\\conf\" \"$dir\\cli\\conf.d\" -} - -# Create directory for custom PHP configuration -if (!(Test-Path \"$dir\\cli\\conf.d\")) { - (New-Item -Type directory \"$dir\\cli\\conf.d\") | Out-Null -} - -# Enable extensions to be found in installation-relative folder (the default is to search C:/php) -(gc \"$dir\\cli\\php.ini\") | % { $_ -replace '; extension_dir = \"ext\"', 'extension_dir = \"ext\"' } | sc \"$dir\\cli\\php.ini\" -", + "post_install": [ + "# Copy ini scan dir from old location before persistent update", + "if ((Test-Path \"$dir\\..\\conf\") -and !(Test-Path \"$dir\\cli\\conf.d\")) {", + " Write-Host -ForegroundColor Cyan \"We are moving your php configuration to $dir\\cli\\conf.d\"", + " Move-Item \"$dir\\..\\conf\" \"$dir\\cli\\conf.d\"", + "}", + "", + "# Create directory for custom PHP configuration", + "if (!(Test-Path \"$dir\\cli\\conf.d\")) {", + " (New-Item -Type directory \"$dir\\cli\\conf.d\") | Out-Null", + "}", + "", + "# Enable extensions to be found in installation-relative folder (the default is to search C:/php)", + "(gc \"$dir\\cli\\php.ini\") | % { $_ -replace '; extension_dir = \"ext\"', 'extension_dir = \"ext\"' } | sc \"$dir\\cli\\php.ini\"" + ], "checkver": { "url": "http://windows.php.net/download/", "re": "

.*?\\(([\\d.]+)\\)

" diff --git a/php.json b/php.json index e110f800ce..8e4751b58e 100644 --- a/php.json +++ b/php.json @@ -27,21 +27,21 @@ "env_set": { "PHP_INI_SCAN_DIR": "$dir\\cli;$dir\\cli\\conf.d;" }, - "post_install": " -# Copy ini scan dir from old location before persistent update -if ((Test-Path \"$dir\\..\\conf\") -and !(Test-Path \"$dir\\cli\\conf.d\")) { - Write-Host -ForegroundColor Cyan \"We are moving your php configuration to $dir\\cli\\conf.d\" - Move-Item \"$dir\\..\\conf\" \"$dir\\cli\\conf.d\" -} - -# Create directory for custom PHP configuration -if (!(Test-Path \"$dir\\cli\\conf.d\")) { - (New-Item -Type directory \"$dir\\cli\\conf.d\") | Out-Null -} - -# Enable extensions to be found in installation-relative folder (the default is to search C:/php) -(gc \"$dir\\cli\\php.ini\") | % { $_ -replace '; extension_dir = \"ext\"', 'extension_dir = \"ext\"' } | sc \"$dir\\cli\\php.ini\" -", + "post_install": [ + "# Copy ini scan dir from old location before persistent update", + "if ((Test-Path \"$dir\\..\\conf\") -and !(Test-Path \"$dir\\cli\\conf.d\")) {", + " Write-Host -ForegroundColor Cyan \"We are moving your php configuration to $dir\\cli\\conf.d\"", + " Move-Item \"$dir\\..\\conf\" \"$dir\\cli\\conf.d\"", + "}", + "", + "# Create directory for custom PHP configuration", + "if (!(Test-Path \"$dir\\cli\\conf.d\")) {", + " (New-Item -Type directory \"$dir\\cli\\conf.d\") | Out-Null", + "}", + "", + "# Enable extensions to be found in installation-relative folder (the default is to search C:/php)", + "(gc \"$dir\\cli\\php.ini\") | % { $_ -replace '; extension_dir = \"ext\"', 'extension_dir = \"ext\"' } | sc \"$dir\\cli\\php.ini\"" + ], "checkver": { "url": "http://windows.php.net/download/", "re": "

.*?\\(([\\d.]+)\\)

" diff --git a/postgresql.json b/postgresql.json index ee0580df31..399ed14fa3 100644 --- a/postgresql.json +++ b/postgresql.json @@ -24,9 +24,9 @@ "env_set": { "PGDATA": "$dir\\data" }, - "post_install": " - if (!(Test-Path \"$dir\\data\\pg_hba.conf\")) { iex \"initdb --username=postgres --encoding=UTF8 --locale=en --lc-collate=C\" } - ", + "post_install": [ + "if (!(Test-Path \"$dir\\data\\pg_hba.conf\")) { iex \"initdb --username=postgres --encoding=UTF8 --locale=en --lc-collate=C\" }" + ], "notes": "To start/stop service, run `pg_ctl start`, `pg_ctl stop`.", "checkver": { "url": "https://www.enterprisedb.com/products-services-training/pgbindownload", diff --git a/python-exp.json b/python-exp.json index 51ba090088..8ccb8ac6f9 100644 --- a/python-exp.json +++ b/python-exp.json @@ -100,19 +100,20 @@ "python3" ] ], - "post_install": " - python -m ensurepip; cp (gcm pip3).path \"$(split-path (gcm pip3).path)/pip.exe\" - $create_reg = { - param($path, $value) - $reg_base = \"Registry::HKEY_CURRENT_USER\\Software\" - new-item -path \"$reg_base\\$path\" -force | out-null - new-itemproperty -path \"$reg_base\\$path\" ` - -name \"(Default)\" -value \"$value\" -force | out-null - } - $create_reg.Invoke(\"Classes\\Python.File\\shell\\open\\command\", \"`\"$dir\\py.exe`\" `\"%1`\" %*\") - $create_reg.Invoke(\"Classes\\.py\", \"Python.File\") - $create_reg.Invoke(\"Python\\PythonCore\\3.5\\InstallPath\", \"$dir\") - $create_reg.Invoke(\"Python\\PythonCore\\3.5\\PythonPath\", \"$dir;$dir\\Lib\\;$dir\\DLLs\\\")", + "post_install": [ + "python -m ensurepip; cp (gcm pip3).path \"$(split-path (gcm pip3).path)/pip.exe\"", + "$create_reg = {", + " param($path, $value)", + " $reg_base = \"Registry::HKEY_CURRENT_USER\\Software\"", + " new-item -path \"$reg_base\\$path\" -force | out-null", + " new-itemproperty -path \"$reg_base\\$path\" `", + " -name \"(Default)\" -value \"$value\" -force | out-null", + "}", + "$create_reg.Invoke(\"Classes\\Python.File\\shell\\open\\command\", \"`\"$dir\\py.exe`\" `\"%1`\" %*\")", + "$create_reg.Invoke(\"Classes\\.py\", \"Python.File\")", + "$create_reg.Invoke(\"Python\\PythonCore\\3.5\\InstallPath\", \"$dir\")", + "$create_reg.Invoke(\"Python\\PythonCore\\3.5\\PythonPath\", \"$dir;$dir\\Lib\\;$dir\\DLLs\\\")" + ], "env_add_path": [ "scripts" ], diff --git a/r.json b/r.json index 8ef3175146..53448b0a0e 100644 --- a/r.json +++ b/r.json @@ -20,15 +20,16 @@ "bin\\curr_arch\\rterm.exe", "bin\\curr_arch\\rscript.exe" ], - "notes": "You'll need to type 'r.ps1' or 'r.cmd' to run R, because in Powershell 'r' runs the last command. Alternatively 'rterm' can be used to start the interactive R terminal session. - -You can remove Powershell's 'r' command with: - rm alias:\\r - -... but this only affects your current session: if you'd like to remove it for all future sessions you need to add the command above to your Powershell profile. - -Annoying, right?! You might want to check out Pshazz (scoop install pshazz)--this has a plugin to remove some crazy aliases from Powershell, as well as many other improvements. -", + "notes": [ + "You'll need to type 'r.ps1' or 'r.cmd' to run R, because in Powershell 'r' runs the last command. Alternatively 'rterm' can be used to start the interactive R terminal session.", + "", + "You can remove Powershell's 'r' command with:", + " rm alias:\\r", + "", + "... but this only affects your current session: if you'd like to remove it for all future sessions you need to add the command above to your Powershell profile.", + "", + "Annoying, right?! You might want to check out Pshazz (scoop install pshazz)--this has a plugin to remove some crazy aliases from Powershell, as well as many other improvements." + ], "checkver": { "url": "https://cran.rstudio.com/bin/windows/base/", "re": "

R-([\\d.]+)" diff --git a/rustup.json b/rustup.json index c65a039f2d..cd6aa22a46 100644 --- a/rustup.json +++ b/rustup.json @@ -21,14 +21,14 @@ "RUSTUP_HOME": "$persist_dir\\.rustup" }, "installer": { - "script": " - # Create environment variables for this process - [Environment]::SetEnvironmentVariable('CARGO_HOME', \"$persist_dir\\.cargo\", 'Process') - [Environment]::SetEnvironmentVariable('RUSTUP_HOME', \"$persist_dir\\.rustup\", 'Process') - - # Install Rustup - & \"$dir\\rustup-init.exe\" -y --no-modify-path --default-toolchain stable-gnu - " + "script": [ + "# Create environment variables for this process", + "[Environment]::SetEnvironmentVariable('CARGO_HOME', \"$persist_dir\\.cargo\", 'Process')", + "[Environment]::SetEnvironmentVariable('RUSTUP_HOME', \"$persist_dir\\.rustup\", 'Process')", + "", + "# Install Rustup", + "& \"$dir\\rustup-init.exe\" -y --no-modify-path --default-toolchain stable-gnu" + ] }, "notes": "To use the MSVC ABI without Visual Studio 2015 (or higher) installed, you will need the Visual Studio 2017 Build Tools: https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017" } diff --git a/srvman.json b/srvman.json index 85fe83848d..1a58fe3b33 100644 --- a/srvman.json +++ b/srvman.json @@ -19,6 +19,8 @@ ] ], "checkver": "The latest version[^<]+