From 06687e14d6beee917e41e36d309d09e56b33ce6d Mon Sep 17 00:00:00 2001 From: Thomas Werkmeister Date: Tue, 16 Apr 2013 15:11:34 +0200 Subject: [PATCH] moved fix to right place --- bootstrap-salt.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 8f2b207..6a34d44 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -477,6 +477,10 @@ __gather_linux_system_info() { # Let's convert CamelCase to Camel Case DISTRO_NAME=$(__camelcase_split "$DISTRO_NAME") fi + #lsb_release -si returns "openSUSE project" on openSUSE 12.3 + if [ "${DISTRO_NAME}" = "openSUSE project" ]; then + DISTRO_NAME="opensuse" + fi rv=$(lsb_release -sr) [ "${rv}x" != "x" ] && DISTRO_VERSION=$(__parse_version_string "$rv") elif [ -f /etc/lsb-release ]; then @@ -723,12 +727,6 @@ if ([ "${DISTRO_NAME_L}" != "ubuntu" ] && [ $ITYPE = "daily" ]) && \ echoerror "${DISTRO_NAME} does not have daily packages support" exit 1 fi - -#lsb_release -si returns "openSUSE project" on openSUSE 12.3 -if [ "${DISTRO_NAME_L}" = "opensuse_project" ]; then - DISTRO_NAME_L="opensuse" -fi - #--- FUNCTION ---------------------------------------------------------------- # NAME: __function_defined