Update journal to work on Linux

diff --git a/files/Microsoft.PowerShell_profile.ps1 b/files/Microsoft.PowerShell_profile.ps1
index ca65107c80a21a64f9c73a902ff6b3e8e84fb4b5..ca2f5e11fbe74cc84d227976105e72ccb715ba98 100644 (file)
--- a/files/Microsoft.PowerShell_profile.ps1
+++ b/files/Microsoft.PowerShell_profile.ps1
@@ -1,5 +1,14 @@
 $env:src = "$HOME\src"
 $env:src = "$HOME\src"

-$env:dotfiles = "$HOME\dotfiles"
+$env:dotfiles = Join-Path $HOME "dotfiles"
+$env:journal = Join-Path $HOME "Journal"
+$env:nvim = Join-Path $HOME "\AppData\Local\nvim"
+
+if($IsWindows) {
+       $env:journal = Join-Path $HOME "Box\Journal"
+       $env:nvim = Join-Path $HOME "\AppData\Local\nvim"
+}
+
+

 Import-Module $env:dotfiles\psmodules\add_to_profile.psm1
 Add-ToProfile $env:dotfiles\files\paths.ps1
 Add-ToProfile $env:dotfiles\files\env.ps1
 Import-Module $env:dotfiles\psmodules\add_to_profile.psm1
 Add-ToProfile $env:dotfiles\files\paths.ps1
 Add-ToProfile $env:dotfiles\files\env.ps1


@@ -23,13 +32,13 @@ function journal {
         [switch]$shared = $false,
         [switch]$dotfiles = $false
     )
         [switch]$shared = $false,
         [switch]$dotfiles = $false
     )

-    $path = "$HOME\Box\Journal"
+    $path = $journal

     switch($key){
         'limited' { $path = "$HOME\Box\SecDevLimited" }
         'shared' { $path = "$HOME\Box\Privacy & Cybersecurity\Cybersecurity Development" }
         'journal' { $path = "$HOME\Box\Journal" }
     switch($key){
         'limited' { $path = "$HOME\Box\SecDevLimited" }
         'shared' { $path = "$HOME\Box\Privacy & Cybersecurity\Cybersecurity Development" }
         'journal' { $path = "$HOME\Box\Journal" }

-        'dotfiles' { $path = "$HOME\dotfiles" }
-        'nvim' { $path = "$HOME\AppData\Local\nvim" }
+        'dotfiles' { $path = $env:dotfiles }
+        'nvim' { $path = $env:nvim }

     }
     cd $path; nvim $path
 }
     }
     cd $path; nvim $path
 }

diff --git a/setup/powershell.sh b/setup/powershell.sh
index 5994882d523de24ec8d7e0dc2cb1393686b4c00c..e69da042dae3bb2287f9124af9392eb3ee520ee8 100755 (executable)
--- a/setup/powershell.sh
+++ b/setup/powershell.sh
@@ -4,13 +4,5 @@ mkdir -p ~/.config/powershell/
 mv ~/.config/powershell/Microsoft.PowerShell_profile.ps1 ~/.config/powershell/profile.backup.ps1
 ln -s ~/dotfiles/files/Microsoft.PowerShell_profile.ps1 ~/.config/powershell/Microsoft.PowerShell_profile.ps1 
 
 mv ~/.config/powershell/Microsoft.PowerShell_profile.ps1 ~/.config/powershell/profile.backup.ps1
 ln -s ~/dotfiles/files/Microsoft.PowerShell_profile.ps1 ~/.config/powershell/Microsoft.PowerShell_profile.ps1 
 

-echo "************** Install PowerShell"
-sudo snap install powershell --classic
-
-if ! [ -f /etc/shells ] || ! grep -q '^/snap/bin/powershell$' /etc/shells; then
-  echo "************** Add PowerShell to /etc/shells"
-  echo '/snap/bin/powershell' | sudo tee -a /etc/shells
-fi
-

 echo "************** Choose Shell: PowerShell"
 echo "************** Choose Shell: PowerShell"

-chsh --shell /snap/bin/powershell
+chsh --shell /usr/bin/pwsh