Init-App modular - first version for Windows

- utilize `$env.Path` on top level scope instead for persistence

Author: atiq-cs

init-app.nu

@@ -11,45 +11,40 @@
 #   init-app reset-env-path
 #
 # .NOTES
-#   Not working on NuShell yet, hence moved to init.nu for now
 #   Targeting apps i.e., choco, python (ML).
 #   Required Env Vars:
 #     - $pfiles_x64_dir
 #------------------------------------------------------------------------------
 
 def main [
-  app_name: string = 'reset-env-path'     # Name of app for which to init
+  app_name: string = 'reset-env-path'   # Name of app for which to init
 ] {
   print $"Init for app: ($app_name)"
-  # ShellHome from config.nu isn't available here on win for some reason
-  let ShellHome = "D:\\Code\\shell"
-  let pfiles_x64_dir = "C:\\PFiles_x64\\choco"
 
-  print $"Current env Path: ($env.Path)"
+  let pfiles_x64_dir = "C:\\PFiles_x64\\choco"
+  let prior_env_path = $env.Path
 
   match $app_name {
     'git' => {
       let git_path = ($pfiles_x64_dir | path join 'git' 'cmd')
-      $env.Path = ($env.Path | append $git_path)
-      # $env.Path = ($env.Path | append "C:\\PFiles_x64\\choco\\git\\cmd")
-      print $"Added to PATH: ($git_path)"
+      let path_with_git = ($prior_env_path | append $git_path)
+      $path_with_git
     }
     'reset-env-path' => {
-      # Example: Reset PATH to default
-      $env.Path = ( [
+      # Reset PATH to default
+      [
         ($env.SystemRoot | path join 'system32'),
         $env.SystemRoot,
         ($env.SystemRoot | path join 'System32' 'Wbem'),
         ($env.LOCALAPPDATA | path join 'Microsoft' 'WindowsApps'),
-        $ShellHome,
         ($env.SystemRoot | path join 'System32' 'OpenSSH'),
-        ($env.SystemRoot | path join 'System32' 'WindowsPowerShell' 'v1.0')
-      ])
+        ($env.SystemRoot | path join 'System32' 'WindowsPowerShell' 'v1.0'),
+        $ShellHome
+      ]
     }
     _ => {
       print $"Invalid command line argument: ($app_name)"
+      $prior_env_path
     }
   }
-
-  print $"Updated env Path: ($env.Path)"
 }

init.nu

@@ -54,25 +54,14 @@ print $"NuShell ($env.NU_VERSION) on ($nu.os-info.name) ($nu.os-info.kernel_vers
 # - InitConsoleUI, and probably
 # - app specific adjustments that are coming from sdkman
 
-# NuShell Env variables are scoped
-# TODO: check sourcing the init-app script here if not try use like a module
+# Nushell doesn't support persistent env.Path inside custom commands
+# Hence, utilize the method/custom command, yet, assign it here
+#  resetEnvPath and `git add` support on Win below
 if ($nu.os-info.name == "windows") {
-  print --no-newline "Init for app: reset-env-path, "
+  print ""
 
-  $env.Path = ( [
-    ($env.SystemRoot | path join 'system32'),
-    $env.SystemRoot,
-    ($env.SystemRoot | path join 'System32' 'Wbem'),
-    ($env.LOCALAPPDATA | path join 'Microsoft' 'WindowsApps'),
-    $ShellHome,
-    ($env.SystemRoot | path join 'System32' 'OpenSSH'),
-    ($env.SystemRoot | path join 'System32' 'WindowsPowerShell' 'v1.0')
-  ])
-
-  print "git"
-  let pfiles_x64_dir = "C:\\PFiles_x64\\choco"
-  let git_path = ($pfiles_x64_dir | path join 'git' 'cmd')
-  $env.Path = ($env.Path | append $git_path)
+  source ./init-app.nu
+  $env.Path = (main reset-env-path)
+  $env.Path = (main git)
 }
-
 print ""