diff --git a/installers/common.sh b/installers/common.sh index 685e67bf..8c19b430 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -11,7 +11,7 @@ git_source_url="https://github.com/$repo" # $repo from install.raspap.com if type lsb_release >/dev/null 2>&1; then # linuxbase.org OS=$(lsb_release -si) - VERSION=$(lsb_release -sr) + RELEASE=$(lsb_release -sr) CODENAME=$(lsb_release -sc) DESC=$(lsb_release -sd) else @@ -20,13 +20,13 @@ fi # Set default home for lighttpd, dhcpcd5 and php package option # based on Linux OS, version -if [ "$VERSION" -eq "10" ]; then +if [ "$RELEASE" -eq "10" ]; then php_package="php7.3-cgi" -elif [ "$VERSION" -eq "9" ]; then +elif [ "$RELEASE" -eq "9" ]; then php_package="php7.0-cgi" -elif [ "$VERSION" -eq "8" ]; then +elif [ "$RELEASE" -eq "8" ]; then install_error "${DESC} and php5 are not supported. Please upgrade." -elif [ "$VERSION" -lt "8" ]; then +elif [ "$RELEASE" -lt "8" ]; then install_error "${DESC} is unsupported. Please install on a supported distro." fi diff --git a/installers/raspbian.sh b/installers/raspbian.sh index 96921fb9..ea828999 100755 --- a/installers/raspbian.sh +++ b/installers/raspbian.sh @@ -31,7 +31,7 @@ # Set defaults repo="billz/raspap-webgui" branch="master" -RASPAP_VERSION=$(curl -s "https://api.github.com/repos/$repo/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' ) +VERSION=$(curl -s "https://api.github.com/repos/$repo/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' ) assume_yes=0 ovpn_option=1 @@ -75,7 +75,7 @@ while :; do exit 1 ;; -v|--version) - printf "RaspAP v${RASPAP_VERSION} - simple AP setup and wifi mangement for the RaspberryPi\n" + printf "RaspAP v${VERSION} - simple AP setup and wifi mangement for the RaspberryPi\n" exit 1 ;; -*|--*) @@ -105,7 +105,7 @@ function display_welcome() { echo -e " 88 88 88. .88 88 88. .88 88 88 88" echo -e " dP dP 88888P8 88888P 88Y888P 88 88 dP" echo -e " 88" - echo -e " dP version ${RASPAP_VERSION}" + echo -e " dP version ${VERSION}" echo -e "${green}" echo -e "The Quick Installer will guide you through a few easy steps\n\n" }