X-Git-Url: https://git.josue.xyz/?a=blobdiff_plain;ds=sidebyside;f=_webi%2Ftemplate.ps1;h=71d4f8249b7a853cdec8d6b9c40b1975f1e11b20;hb=de7eb27ee75d8c3ad8b1a0491b58d1fbbfe088b2;hp=491e3a544c17bf69fbbaf86b791c8b9c21dffcdf;hpb=85a231cc55e039a7e99a5a853a7d7ad8519fa596;p=webi-installers%2F.git

diff --git a/_webi/template.ps1 b/_webi/template.ps1
index 491e3a5..71d4f82 100644
--- 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'
 
@@ -16,26 +21,25 @@ $Env:WEBI_HOST = 'https://webinstall.dev'
 # Switch to userprofile
 pushd $Env:USERPROFILE
 
-# Make paths if needed
-if (!(Test-Path -Path Downloads))
-{
-    New-Item -Path Downloads -ItemType Directory
-}
-if (!(Test-Path -Path .local\bin))
-{
-    New-Item -Path .local\bin -ItemType Directory
-}
-if (!(Test-Path -Path .local\opt))
-{
-    New-Item -Path .local\opt -ItemType Directory
-}
+# Make paths
+New-Item -Path Downloads -ItemType Directory -Force | out-null
+New-Item -Path .local\bin -ItemType Directory -Force | out-null
+New-Item -Path .local\opt -ItemType Directory -Force | out-null
 
 # {{ 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 %USERPROFILE%\.local\bin
+& "$Env:USERPROFILE\.local\bin\pathman.exe" add ~/.local/bin
 
 {{ installer }}