X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Ffunctions.sh;h=b39a9d3005986dc4357d956704515de201542e3a;hb=77e3aa021463bddde7b1219849b8911b1ee5c6f6;hp=c1401efe3682d09a7478bd8842b42ee7bfdc4516;hpb=10ef2e61054f8583ea96d7228b41ab2e4f2ddfc3;p=feisty_meow.git diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index c1401efe..b39a9d30 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -38,7 +38,7 @@ if [ -z "$skip_all" ]; then # happens. function whichable() { - to_find="$1"; shift + local to_find="$1"; shift local WHICHER="$(/usr/bin/which which 2>/dev/null)" #>&2 echo "got whicher as: $WHICHER" if [ $? -ne 0 ]; then @@ -446,8 +446,12 @@ if [ -z "$skip_all" ]; then # returns a successful value (0) if this system is debian or ubuntu. function debian_like() { # decide if we think this is debian or ubuntu or a variant. - DEBIAN_LIKE=$(if [ ! -z "$(grep -i debian /etc/issue)" \ - -o ! -z "$(grep -i ubuntu /etc/issue)" ]; then echo 1; else echo 0; fi) + DEBIAN_LIKE=$( \ + if [ \ + ! -z "$(grep -i debian /etc/issue)" -o \ + ! -z "$(grep -i ubuntu /etc/issue)" -o \ + ! -z "$(grep -i 'Pop._OS' /etc/issue)" \ + ]; then echo 1; else echo 0; fi) if [ $DEBIAN_LIKE -eq 1 ]; then # success; this is debianish. return 0