Protected W_MAIN against incorrect expansions.
This commit is contained in:
18
install.sh
18
install.sh
@@ -1,4 +1,4 @@
|
|||||||
#! /bin/bash
|
#! /bin/sh
|
||||||
|
|
||||||
RED="\e[31m"
|
RED="\e[31m"
|
||||||
GREEN="\e[32m"
|
GREEN="\e[32m"
|
||||||
@@ -61,11 +61,11 @@ W_MAIN=$(
|
|||||||
3>&1 1>&2 2>&3
|
3>&1 1>&2 2>&3
|
||||||
)
|
)
|
||||||
|
|
||||||
if [ -z $W_MAIN ]; then
|
if [ -z "$W_MAIN" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $W_MAIN = "update" ]; then
|
if [ "$W_MAIN" = "update" ]; then
|
||||||
./scripts/update
|
./scripts/update
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
@@ -91,19 +91,19 @@ fi
|
|||||||
|
|
||||||
mkdir -p "$HOME/dotfiles/logs"
|
mkdir -p "$HOME/dotfiles/logs"
|
||||||
|
|
||||||
if [ $W_MAIN = "flatpak" ]; then
|
if [ "$W_MAIN" = "flatpak" ]; then
|
||||||
sudo pacman -S flatpak
|
sudo pacman -S flatpak
|
||||||
sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
|
sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $W_MAIN = "vulns" ]; then
|
if [ "$W_MAIN" = "vulns" ]; then
|
||||||
printf "%b\n" "${CYAN}[I]${NC} Packages that contain known vulnerabilities:"
|
printf "%b\n" "${CYAN}[I]${NC} Packages that contain known vulnerabilities:"
|
||||||
arch-audit
|
arch-audit
|
||||||
printf "\n%b\n" "${RED}[I]${NC} Packages that can be fixed by updating:"
|
printf "\n%b\n" "${RED}[I]${NC} Packages that can be fixed by updating:"
|
||||||
arch-audit -u
|
arch-audit -u
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $W_MAIN = "paru" ]; then
|
if [ "$W_MAIN" = "paru" ]; then
|
||||||
sudo pacman -S --needed base-devel
|
sudo pacman -S --needed base-devel
|
||||||
git clone https://aur.archlinux.org/paru.git --depth=1
|
git clone https://aur.archlinux.org/paru.git --depth=1
|
||||||
cd paru
|
cd paru
|
||||||
@@ -112,7 +112,7 @@ if [ $W_MAIN = "paru" ]; then
|
|||||||
rm -rf paru
|
rm -rf paru
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $W_MAIN = "setup" ]; then
|
if [ "$W_MAIN" = "setup" ]; then
|
||||||
printf "%b\n" "${YELLOW}[+]${NC} Installing GNOME..."
|
printf "%b\n" "${YELLOW}[+]${NC} Installing GNOME..."
|
||||||
sudo pacman -S gnome
|
sudo pacman -S gnome
|
||||||
|
|
||||||
@@ -131,7 +131,7 @@ if [ $W_MAIN = "setup" ]; then
|
|||||||
sudo systemctl enable gdm.service
|
sudo systemctl enable gdm.service
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $W_MAIN = "install" ]; then
|
if [ "$W_MAIN" = "install" ]; then
|
||||||
sudo cp -f ./pacman.conf /etc/pacman.conf
|
sudo cp -f ./pacman.conf /etc/pacman.conf
|
||||||
./scripts/update
|
./scripts/update
|
||||||
|
|
||||||
@@ -147,7 +147,7 @@ if [ $W_MAIN = "install" ]; then
|
|||||||
sudo reflector --sort rate --fastest 10 --verbose --protocol https --latest 200 --save /etc/pacman.d/mirrorlist
|
sudo reflector --sort rate --fastest 10 --verbose --protocol https --latest 200 --save /etc/pacman.d/mirrorlist
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$W_MAIN" = "install" ] || [ "$W_MAIN" = "reload" ]; then
|
if [ ""$W_MAIN"" = "install" ] || [ ""$W_MAIN"" = "reload" ]; then
|
||||||
# Copy files
|
# Copy files
|
||||||
printf "%b\n" "${YELLOW}[+]${NC} Installing Dotfiles..."
|
printf "%b\n" "${YELLOW}[+]${NC} Installing Dotfiles..."
|
||||||
cp -r "$HOME/dotfiles/home/." "$HOME"
|
cp -r "$HOME/dotfiles/home/." "$HOME"
|
||||||
|
|||||||
Reference in New Issue
Block a user