flyingscorpio/setup-cockpit
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add absolute paths and 'OS' instead of 'os'

Browse source
This commit is contained in:
flyingscorpio@pinebook-pro 2020-03-03 14:49:48 +01:00
parent 1e308f3437
commit dabe8c8da8
1 changed files with 24 additions and 22 deletions

46
SetupCockpit/setup_cockpit.sh
View file

@ -9,32 +9,32 @@
if [ -z "$1" ]; then
echo "Which OS are you using?"
select os in 'debian - ubuntu' 'arch - manjaro'; do
case $os in
'debian - ubuntu' ) os='debian'; break;;
'arch - manjaro' ) os='arch'; break;;
select OS in 'debian - ubuntu' 'arch - manjaro'; do
case $OS in
'debian - ubuntu' ) OS='debian'; break;;
'arch - manjaro' ) OS='arch'; break;;
esac
done
else
if [ "$1" = 'debian' ] || [ "$1" = 'ubuntu' ]; then
os='debian'
OS='debian'
elif [ "$1" = 'arch' ] || [ "$1" = 'manjaro' ]; then
os='arch'
OS='arch'
else
echo "${ORANGE}Didn't understand OS argument${NC}"
echo "Which OS are you using?"
select os in 'debian - ubuntu' 'arch - manjaro'; do
case $os in
'debian - ubuntu' ) os='debian'; break;;
'arch - manjaro' ) os='arch'; break;;
select OS in 'debian - ubuntu' 'arch - manjaro'; do
case $OS in
'debian - ubuntu' ) OS='debian'; break;;
'arch - manjaro' ) OS='arch'; break;;
esac
done
fi
fi
echo "Using $os"
export os
echo "Using $OS"
export OS
/bin/bash separator.sh
/bin/bash ~/PersonnalScripts/SetupCockpit/separator.sh
###################
@ -43,16 +43,16 @@ export os
echo "Installing scripts..."
if [ "$os" = 'debian' ]; then
/bin/bash debian_based_installs.sh
elif [ "$os" = 'arch' ]; then
/bin/bash arch_based_installs.sh
if [ "$OS" = 'debian' ]; then
/bin/bash ~/PersonnalScripts/SetupCockpit/debian_based_installs.sh
elif [ "$OS" = 'arch' ]; then
/bin/bash ~/PersonnalScripts/SetupCockpit/arch_based_installs.sh
else
echo "${RED} Didn't receive correct OS information, quitting...${NC}"
exit 1
fi
/bin/bash separator.sh
/bin/bash ~/PersonnalScripts/SetupCockpit/separator.sh
########################
@ -66,7 +66,7 @@ else
echo "${ORANGE}There was a problem while updating .bash_aliases${NC}"
fi
/bin/bash separator.sh
/bin/bash ~/PersonnalScripts/SetupCockpit/separator.sh
#################
@ -82,7 +82,7 @@ git config --global alias.co "checkout"
git config --global alias.st "status"
git config --global alias.br "branch"
/bin/bash separator.sh
/bin/bash ~/PersonnalScripts/SetupCockpit/separator.sh
##############################################################################
@ -103,7 +103,7 @@ echo "<?xml version=\"1.0\"?>
</mime-info>" >> ~/.local/share/mime/packages/text-markdown.xml
fi
/bin/bash separator.sh
/bin/bash ~/PersonnalScripts/SetupCockpit/separator.sh
##################
@ -114,7 +114,7 @@ echo "Cloning projects..."
/bin/bash clone_projects.sh
/bin/bash separator.sh
/bin/bash ~/PersonnalScripts/SetupCockpit/separator.sh
#######################
@ -126,3 +126,5 @@ if sudo protonvpn init; then
else
echo "${RED}There was a problem with protonvpn init${NC}"
fi
/bin/bash ~/PersonnalScripts/SetupCockpit/separator.sh