hotfix to remove trailing '}' from bin names

[webi-installers/.git] / _webi / template.ps1

diff --git a/_webi/template.ps1 b/_webi/template.ps1
index 7a72e7008054e60a374347687fa4536e5a5702bf..6ddd2fcee73bc4242c53bba48e09eda27a03eff4 100644 (file)
--- a/_webi/template.ps1
+++ b/_webi/template.ps1
@@ -1,5 +1,10 @@
 #!/usr/bin/env pwsh
 
+# this allows us to call ps1 files, which allows us to have spaces in filenames
+# ('powershell "$Env:USERPROFILE\test.ps1" foo' will fail if it has a space in
+# the path but '& "$Env:USERPROFILE\test.ps1" foo' will work even with a space)
+Set-ExecutionPolicy -Scope Process Bypass
+
 # If a command returns an error, halt the script.
 $ErrorActionPreference = 'Stop'
 
@@ -33,9 +38,17 @@ if (!(Test-Path -Path .local\opt))
 # {{ baseurl }}
 # {{ version }}
 
+function webi_add_path
+{
+    & "$Env:USERPROFILE\.local\bin\pathman.exe" add "$args[0]"
+    # Note: not all of these work as expected, so we use the unix-style, which is most consistent
+    #& "$Env:USERPROFILE\.local\bin\pathman.exe" add ~/.local/bin
+    #& "$Env:USERPROFILE\.local\bin\pathman.exe" add "$Env:USERPROFILE\.local\bin"
+    #& "$Env:USERPROFILE\.local\bin\pathman.exe" add %USERPROFILE%\.local\bin
+}
+
 # Run pathman to set up the folder
-#& "$Env:USERPROFILE\.local\bin\pathman.exe" add "$Env:USERPROFILE\.local\.bin"
-& "$Env:USERPROFILE\.local\bin\pathman.exe" add .local\.bin
+& "$Env:USERPROFILE\.local\bin\pathman.exe" add ~/.local/bin
 
 {{ installer }}