More fixes for PowerShell install.

diff --git a/install/powershell7_pi.sh b/install/powershell7_pi.sh
index bd10bf43dda3b426cc5347d9d48dcfe340543a17..a16016a4ef5f7df21c23a0a07474825e2c7a9499 100755 (executable)
--- a/install/powershell7_pi.sh
+++ b/install/powershell7_pi.sh
@@ -29,3 +29,6 @@ tar -xvf /tmp/powershell.tar.gz -C /opt/powershell/
 
 # Link the shell to the usual place to find it.
 ln -s /opt/powershell/pwsh /usr/bin/pwsh
 
 # Link the shell to the usual place to find it.
 ln -s /opt/powershell/pwsh /usr/bin/pwsh

+echo "/usr/bin/pwsh" >> /etc/shells
+
+echo "PowerShell should now be installed. See ./setup/powershell.sh for how to chagne shells."

diff --git a/setup.sh b/setup.sh
index 789314404fab0a7dc93dcb9bb7861efbc8b6a6da..ff7b64cd61b8d01635cf628d3a29495cd3dbde3b 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -13,13 +13,6 @@ if [ ! -f ~/.screenrc ]; then
        ln -s ~/dotfiles/screenrc ~/.screenrc
 fi
 
        ln -s ~/dotfiles/screenrc ~/.screenrc
 fi
 

-if [ ! -f ~/.config/powershell/Microsoft.PowerShell_profile.ps1 ]; then
-       echo "************** Setup PowerShell"
-       chsh --shell /usr/bin/pwsh
-       mkdir -p ~/.config/powershell/
-       ln -s ~/dotfiles/Microsoft.PowerShell_profile.ps1 ~/.config/powershell/Microsoft.PowerShell_profile.ps1 
-fi
-

 if [ ! -f ~/.vimrc ]; then
        echo "************** Link Vimrc"
        ln -s ~/dotfiles/vimrc ~/.vimrc
 if [ ! -f ~/.vimrc ]; then
        echo "************** Link Vimrc"
        ln -s ~/dotfiles/vimrc ~/.vimrc

diff --git a/setup/powershell.sh b/setup/powershell.sh
index a1c23e37bae5babbed1af28d60fa5f92f2facb03..6b873245d460d87173723acf7b9517433c432f5e 100755 (executable)
--- a/setup/powershell.sh
+++ b/setup/powershell.sh
@@ -4,3 +4,5 @@ if [ ! -f ~/.config/powershell/Microsoft.PowerShell_profile.ps1 ]; then
        mkdir -p ~/.config/powershell/
        ln -s ~/dotfiles/Microsoft.PowerShell_profile.ps1 ~/.config/powershell/Microsoft.PowerShell_profile.ps1 
 fi
        mkdir -p ~/.config/powershell/
        ln -s ~/dotfiles/Microsoft.PowerShell_profile.ps1 ~/.config/powershell/Microsoft.PowerShell_profile.ps1 
 fi

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