iankelling.org
/
git
/
distro-functions
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes and impreovements
[distro-functions]
/
src
/
identify-distros
diff --git
a/src/identify-distros
b/src/identify-distros
index c3cfc723c585d9737d958a874026eb54146482bf..f9d68ff95e934d6b11548b3804e9f429d40d417d 100644
(file)
--- a/
src/identify-distros
+++ b/
src/identify-distros
@@
-77,7
+77,7
@@
EOF
if (( ${#shortest} > ${#name} )); then
shortest=$name
fi
if (( ${#shortest} > ${#name} )); then
shortest=$name
fi
- done < <(echo "$policy" | sed -rn "$expression" | sort -rn)
+ done < <(echo "$policy" | sed -rn "$expression" | sort -rn
|| [[ $? == 141 ]]
)
echo "$shortest"
}
echo "$shortest"
}
@@
-95,7
+95,7
@@
debian-codename() {
isdeb || return 0
local policy="$(apt-cache policy)" || return $?
archive=$(debian-archive "$policy")
isdeb || return 0
local policy="$(apt-cache policy)" || return $?
archive=$(debian-archive "$policy")
- echo "$policy" | sed -rn "s/^.*a=$archive,n=([a-z]+).*/\1/p;T;q"
+ echo "$policy" | sed -rn "s/^.*a=$archive,n=([a-z]+).*/\1/p;T;q"
|| [[ $? == 141 ]]
}
debian-codename-compat() {
local n=$(debian-codename)
}
debian-codename-compat() {
local n=$(debian-codename)
@@
-103,6
+103,9
@@
debian-codename-compat() {
flidas)
echo xenial
;;
flidas)
echo xenial
;;
+ etiona)
+ echo bionic
+ ;;
*)
echo $n
;;
*)
echo $n
;;