Merge pull request #447 from dylanaraps/lsb-release

Distro: Remove lsb_release block
This commit is contained in:
Dylan Araps 2016-11-21 14:04:24 +11:00 committed by GitHub
commit 48ef9191ed
1 changed files with 1 additions and 9 deletions

View File

@ -138,14 +138,6 @@ get_distro() {
*) distro="Red Star OS $(awk -F'[^0-9*]' '$0=$2' /etc/redstar-release)" *) distro="Red Star OS $(awk -F'[^0-9*]' '$0=$2' /etc/redstar-release)"
esac esac
elif type -p lsb_release >/dev/null; then
case "$distro_shorthand" in
"on") lsb_flags="-sir" ;;
"tiny") lsb_flags="-si" ;;
*) lsb_flags="-sd" ;;
esac
distro="$(lsb_release $lsb_flags)"
elif type -p guix >/dev/null; then elif type -p guix >/dev/null; then
distro="GuixSD" distro="GuixSD"
@ -161,7 +153,7 @@ get_distro() {
else else
# Source the os-release file # Source the os-release file
for file in /etc/os-release /etc/*ease /usr/lib/*ease; do for file in /etc/os-release /usr/lib/os-release /etc/*release /usr/lib/*release; do
source "$file" && break source "$file" && break
done done