mirror of
				https://github.com/ScoopInstaller/Main.git
				synced 2025-10-31 22:01:19 +00:00 
			
		
		
		
	chore: Fix 'current_dir' error (#3363)
This commit is contained in:
		
							parent
							
								
									eb8beba311
								
							
						
					
					
						commit
						51a0160a6f
					
				| @ -18,11 +18,11 @@ | ||||
|         } | ||||
|     }, | ||||
|     "pre_install": [ | ||||
|         "$current = current_dir $dir", | ||||
|         "$current_dir = if (get_config NO_JUNCTIONS) { $dir } else { \"$(appdir $app $global)\\current\" }", | ||||
|         "$content = @(", | ||||
|         "    \"DataDirectory `\"$current\\Data\\Data`\"\"", | ||||
|         "    \"GeoIPFile `\"$current\\Data\\Tor\\geoip`\"\"", | ||||
|         "    \"GeoIPv6File `\"$current\\Data\\Tor\\geoip6`\"\"", | ||||
|         "    \"DataDirectory `\"$current_dir\\Data\\Data`\"\"", | ||||
|         "    \"GeoIPFile `\"$current_dir\\Data\\Tor\\geoip`\"\"", | ||||
|         "    \"GeoIPv6File `\"$current_dir\\Data\\Tor\\geoip6`\"\"", | ||||
|         ")", | ||||
|         "if (!(Test-Path \"$persist_dir\\torrc\")) {", | ||||
|         "    Add-Content \"$dir\\torrc\" $content.Replace('\\', '/') -Encoding ASCII -Force", | ||||
|  | ||||
| @ -15,9 +15,11 @@ | ||||
|         "Move-Item \"$dir\\GvimExt64\\`$R0\" \"$dir\\GvimExt64\\gvimext.dll\"", | ||||
|         "Move-Item \"$dir\\GvimExt64\\`$0\\GvimExt64\\*\" \"$dir\\GvimExt64\"", | ||||
|         "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 {", | ||||
|         "    $vimpath = \"$(current_dir $dir)\\gVim.exe\".Replace('\\', '\\\\')", | ||||
|         "    $vimpath = \"$dir\\gVim.exe\".Replace('\\', '\\\\')", | ||||
|         "    $content = (Get-Content \"$bucketsdir\\main\\scripts\\vim\\$_\").Replace('$vim', $vimpath)", | ||||
|         "    if ($global) { $content = $content.Replace('HKEY_CURRENT_USER', 'HKEY_LOCAL_MACHINE') }", | ||||
|         "    Set-Content \"$dir\\$_\" $content", | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Hsiao-nan Cheung
						Hsiao-nan Cheung