itssoap/ScoopInstaller_Main
1
0
Fork 0
mirror of https://github.com/ScoopInstaller/Main.git synced 2025-11-01 06:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Fix 'current_dir' error (#3363)

Browse Source
This commit is contained in:
Hsiao-nan Cheung 2022-03-09 13:00:36 +08:00 committed by GitHub
parent eb8beba311
commit 51a0160a6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bucket/tor.json
View File

@ -18,11 +18,11 @@
} }
}, },
"pre_install": [ "pre_install": [
"$current = current_dir $dir", "$current_dir = if (get_config NO_JUNCTIONS) { $dir } else { \"$(appdir $app $global)\\current\" }",
"$content = @(", "$content = @(",
" \"DataDirectory `\"$current\\Data\\Data`\"\"", " \"DataDirectory `\"$current_dir\\Data\\Data`\"\"",
" \"GeoIPFile `\"$current\\Data\\Tor\\geoip`\"\"", " \"GeoIPFile `\"$current_dir\\Data\\Tor\\geoip`\"\"",
" \"GeoIPv6File `\"$current\\Data\\Tor\\geoip6`\"\"", " \"GeoIPv6File `\"$current_dir\\Data\\Tor\\geoip6`\"\"",
")", ")",
"if (!(Test-Path \"$persist_dir\\torrc\")) {", "if (!(Test-Path \"$persist_dir\\torrc\")) {",
" Add-Content \"$dir\\torrc\" $content.Replace('\\', '/') -Encoding ASCII -Force", " Add-Content \"$dir\\torrc\" $content.Replace('\\', '/') -Encoding ASCII -Force",

6
bucket/vim.json
View File

@ -15,9 +15,11 @@
"Move-Item \"$dir\\GvimExt64\\`$R0\" \"$dir\\GvimExt64\\gvimext.dll\"", "Move-Item \"$dir\\GvimExt64\\`$R0\" \"$dir\\GvimExt64\\gvimext.dll\"",
"Move-Item \"$dir\\GvimExt64\\`$0\\GvimExt64\\*\" \"$dir\\GvimExt64\"", "Move-Item \"$dir\\GvimExt64\\`$0\\GvimExt64\\*\" \"$dir\\GvimExt64\"",
"Move-Item \"$dir\\`$*\\*\" $dir", "Move-Item \"$dir\\`$*\\*\" $dir",
"Remove-Item \"$dir\\`$*\", \"$dir\\GvimExt32\", \"$dir\\GvimExt64\\`$0\", \"$dir\\uninstal.*\", \"$dir\\install.exe\", \"$dir\\vim[0-9]*\" -Recurse", "Remove-Item \"$dir\\`$*\", \"$dir\\GvimExt32\", \"$dir\\GvimExt64\\`$0\", \"$dir\\uninstal.*\", \"$dir\\install.exe\", \"$dir\\vim[0-9]*\" -Recurse"
],
"post_install": [
"'install-context.reg', 'uninstall-context.reg' | ForEach-Object {", "'install-context.reg', 'uninstall-context.reg' | ForEach-Object {",
" $vimpath = \"$(current_dir $dir)\\gVim.exe\".Replace('\\', '\\\\')", " $vimpath = \"$dir\\gVim.exe\".Replace('\\', '\\\\')",
" $content = (Get-Content \"$bucketsdir\\main\\scripts\\vim\\$_\").Replace('$vim', $vimpath)", " $content = (Get-Content \"$bucketsdir\\main\\scripts\\vim\\$_\").Replace('$vim', $vimpath)",
" if ($global) { $content = $content.Replace('HKEY_CURRENT_USER', 'HKEY_LOCAL_MACHINE') }", " if ($global) { $content = $content.Replace('HKEY_CURRENT_USER', 'HKEY_LOCAL_MACHINE') }",
" Set-Content \"$dir\\$_\" $content", " Set-Content \"$dir\\$_\" $content",