diff options
| -rwxr-xr-x | public/thesiah-mac.sh | 4 | ||||
| -rwxr-xr-x | public/thesiah.sh | 16 | ||||
| -rwxr-xr-x | static/thesiah-mac.sh | 4 | ||||
| -rwxr-xr-x | static/thesiah.sh | 16 |
4 files changed, 20 insertions, 20 deletions
diff --git a/public/thesiah-mac.sh b/public/thesiah-mac.sh index dd9c563..a38d7f1 100755 --- a/public/thesiah-mac.sh +++ b/public/thesiah-mac.sh @@ -93,7 +93,7 @@ tapinstall() { # Install mac apps with mas masinstall() { echo "Installing the mac app: $1" - + # Search for the app by name and get its ID using awk to parse the output id=$(mas search "$1" | awk -v appName="$1" '{if ($0 ~ appName) {print $1; exit}}') # Check if the id variable is set and not empty @@ -145,7 +145,7 @@ getuserandpass brewinstall || error "Failed to install Homebrew." # Ensure mas is installed -installpkg "mas" +installpkg "mas" # Start the installation loop for software from the CSV installationloop diff --git a/public/thesiah.sh b/public/thesiah.sh index a096123..60be7b9 100755 --- a/public/thesiah.sh +++ b/public/thesiah.sh @@ -219,7 +219,7 @@ installationloop() { comment="$(echo "$comment" | sed -E "s/(^\"|\"$)//g")" case "$tag" in "A") aurinstall "$program" "$comment" ;; - "I") + "I") case "$(readlink -f /sbin/init)" in *systemd*) maininstall "$program" "$comment" ;; *) initinstall "$program" "$comment" ;; @@ -367,7 +367,7 @@ ecryptfssetup() { ufwsetup() { whiptail --infobox "Setting up ufw..." 7 50 [ -x "$(command -v "ufw")" ] || installpkg ufw - [ ! "$initsys" = "systemd" ] && { + [ ! "$initsys" = "systemd" ] && { pacman -Qq ufw-"$initsys" >/dev/null 2>&1 || installpkg ufw-"$initsys" } sleep 1 @@ -414,7 +414,7 @@ ufwsetup() { sambasetup() { whiptail --infobox "Setting up samba..." 7 50 [ -x "$(command -v "samba")" ] || installpkg samba - [ ! "$initsys" = "systemd" ] && { + [ ! "$initsys" = "systemd" ] && { pacman -Qq samba-"$initsys" >/dev/null 2>&1 || installpkg samba-"$initsys" } sleep 1 @@ -459,7 +459,7 @@ sambasetup() { bluezsetup() { whiptail --infobox "Setting up bluetooth..." 7 50 pacman -Qq bluez >/dev/null 2>&1 || installpkg bluez - [ ! "$initsys" = "systemd" ] && { + [ ! "$initsys" = "systemd" ] && { pacman -Qq bluez-"$initsys" >/dev/null 2>&1 || installpkg bluez-"$initsys" } sleep 3 @@ -487,7 +487,7 @@ bluezsetup() { cronsetup() { whiptail --infobox "Setting up cronjob..." 7 50 pacman -Qq cronie >/dev/null 2>&1 || installpkg cronie - [ ! "$initsys" = "systemd" ] && { + [ ! "$initsys" = "systemd" ] && { pacman -Qq cronie-"$initsys" >/dev/null 2>&1 || installpkg cronie-"$initsys" } sleep 1 @@ -524,7 +524,7 @@ cronsetup() { tlpsetup() { whiptail --infobox "Setting up tlp..." 7 50 [ -x "$(command -v "tlp")" ] || installpkg tlp - [ ! "$initsys" = "systemd" ] && { + [ ! "$initsys" = "systemd" ] && { pacman -Qq tlp-"$initsys" >/dev/null 2>&1 || installpkg tlp-"$initsys" } sleep 1 @@ -567,7 +567,7 @@ bbswitchsetup() { sshsetup() { whiptail --infobox "Setting up ssh..." 7 50 [ -x "$(command -v "ssh")" ] || installpkg openssh - [ ! "$initsys" = "systemd" ] && { + [ ! "$initsys" = "systemd" ] && { pacman -Qq openssh-"$initsys" >/dev/null 2>&1 || installpkg openssh-"$initsys" } sleep 1 @@ -597,7 +597,7 @@ sshsetup() { vpnsetup() { whiptail --infobox "Setting up vpn..." 7 50 [ -x "$(command -v "openvpn")" ] || installpkg openvpn - [ ! "$initsys" = "systemd" ] && { + [ ! "$initsys" = "systemd" ] && { pacman -Qq openvpn-"$initsys" >/dev/null 2>&1 || installpkg openvpn-"$initsys" } pacman -Qq networkmanager-openvpn >/dev/null 2>&1 || installpkg networkmanager-openvpn diff --git a/static/thesiah-mac.sh b/static/thesiah-mac.sh index dd9c563..a38d7f1 100755 --- a/static/thesiah-mac.sh +++ b/static/thesiah-mac.sh @@ -93,7 +93,7 @@ tapinstall() { # Install mac apps with mas masinstall() { echo "Installing the mac app: $1" - + # Search for the app by name and get its ID using awk to parse the output id=$(mas search "$1" | awk -v appName="$1" '{if ($0 ~ appName) {print $1; exit}}') # Check if the id variable is set and not empty @@ -145,7 +145,7 @@ getuserandpass brewinstall || error "Failed to install Homebrew." # Ensure mas is installed -installpkg "mas" +installpkg "mas" # Start the installation loop for software from the CSV installationloop diff --git a/static/thesiah.sh b/static/thesiah.sh index a096123..60be7b9 100755 --- a/static/thesiah.sh +++ b/static/thesiah.sh @@ -219,7 +219,7 @@ installationloop() { comment="$(echo "$comment" | sed -E "s/(^\"|\"$)//g")" case "$tag" in "A") aurinstall "$program" "$comment" ;; - "I") + "I") case "$(readlink -f /sbin/init)" in *systemd*) maininstall "$program" "$comment" ;; *) initinstall "$program" "$comment" ;; @@ -367,7 +367,7 @@ ecryptfssetup() { ufwsetup() { whiptail --infobox "Setting up ufw..." 7 50 [ -x "$(command -v "ufw")" ] || installpkg ufw - [ ! "$initsys" = "systemd" ] && { + [ ! "$initsys" = "systemd" ] && { pacman -Qq ufw-"$initsys" >/dev/null 2>&1 || installpkg ufw-"$initsys" } sleep 1 @@ -414,7 +414,7 @@ ufwsetup() { sambasetup() { whiptail --infobox "Setting up samba..." 7 50 [ -x "$(command -v "samba")" ] || installpkg samba - [ ! "$initsys" = "systemd" ] && { + [ ! "$initsys" = "systemd" ] && { pacman -Qq samba-"$initsys" >/dev/null 2>&1 || installpkg samba-"$initsys" } sleep 1 @@ -459,7 +459,7 @@ sambasetup() { bluezsetup() { whiptail --infobox "Setting up bluetooth..." 7 50 pacman -Qq bluez >/dev/null 2>&1 || installpkg bluez - [ ! "$initsys" = "systemd" ] && { + [ ! "$initsys" = "systemd" ] && { pacman -Qq bluez-"$initsys" >/dev/null 2>&1 || installpkg bluez-"$initsys" } sleep 3 @@ -487,7 +487,7 @@ bluezsetup() { cronsetup() { whiptail --infobox "Setting up cronjob..." 7 50 pacman -Qq cronie >/dev/null 2>&1 || installpkg cronie - [ ! "$initsys" = "systemd" ] && { + [ ! "$initsys" = "systemd" ] && { pacman -Qq cronie-"$initsys" >/dev/null 2>&1 || installpkg cronie-"$initsys" } sleep 1 @@ -524,7 +524,7 @@ cronsetup() { tlpsetup() { whiptail --infobox "Setting up tlp..." 7 50 [ -x "$(command -v "tlp")" ] || installpkg tlp - [ ! "$initsys" = "systemd" ] && { + [ ! "$initsys" = "systemd" ] && { pacman -Qq tlp-"$initsys" >/dev/null 2>&1 || installpkg tlp-"$initsys" } sleep 1 @@ -567,7 +567,7 @@ bbswitchsetup() { sshsetup() { whiptail --infobox "Setting up ssh..." 7 50 [ -x "$(command -v "ssh")" ] || installpkg openssh - [ ! "$initsys" = "systemd" ] && { + [ ! "$initsys" = "systemd" ] && { pacman -Qq openssh-"$initsys" >/dev/null 2>&1 || installpkg openssh-"$initsys" } sleep 1 @@ -597,7 +597,7 @@ sshsetup() { vpnsetup() { whiptail --infobox "Setting up vpn..." 7 50 [ -x "$(command -v "openvpn")" ] || installpkg openvpn - [ ! "$initsys" = "systemd" ] && { + [ ! "$initsys" = "systemd" ] && { pacman -Qq openvpn-"$initsys" >/dev/null 2>&1 || installpkg openvpn-"$initsys" } pacman -Qq networkmanager-openvpn >/dev/null 2>&1 || installpkg networkmanager-openvpn |