feature/os-debian-no-aptitude #1

Merged
psi-jack merged 10 commits from feature/os-debian-no-aptitude into master 2024-07-07 16:39:20 -04:00
Showing only changes of commit 5cf85362dc - Show all commits

View file

@ -19,7 +19,7 @@ createRestoreDir() {
} }
checkOS() { checkOS() {
if [[ "$kernel" == "Darin" ]]; then if [[ "$kernel" == "Darwin" ]]; then
return 0 return 0
elif [[ "$kernel" == "Linux" ]]; then elif [[ "$kernel" == "Linux" ]]; then
if [[ -f /etc/os-release ]]; then if [[ -f /etc/os-release ]]; then
@ -27,7 +27,7 @@ checkOS() {
DISTRO="$ID" DISTRO="$ID"
DISTRO_CURRENT="$DISTRO" DISTRO_CURRENT="$DISTRO"
if [[ -n "$ID_LIKE" ]]; then if [[ -n "$ID_LIKE" ]]; then
DISTRO="$ID_LIKE" DISTRO="${ID_LIKE# *}"
fi fi
return 0 return 0
else else
@ -45,6 +45,7 @@ runOsHook() {
"${scriptPath}/os_macos" "$hook" "${scriptPath}/os_macos" "$hook"
elif [[ "$kernel" == "Linux" ]]; then elif [[ "$kernel" == "Linux" ]]; then
case "$DISTRO" in case "$DISTRO" in
ubuntu) "${scriptPath}/os_debian" "$hook";;
debian) "${scriptPath}/os_debian" "$hook";; debian) "${scriptPath}/os_debian" "$hook";;
fedora) "${scriptPath}/os_fedora" "$hook";; fedora) "${scriptPath}/os_fedora" "$hook";;
garuda) "${scriptPath}/os_garuda" "$hook";; garuda) "${scriptPath}/os_garuda" "$hook";;