frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2023-10-10 13:37:24 +02:00
Code Issues Releases Wiki Activity

Minor: rename version > release

Browse Source
This commit is contained in:
billz 2020-03-17 20:05:41 +00:00
parent ead1f354d7
commit c52487c671
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
installers/common.sh
View File

@ -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 if type lsb_release >/dev/null 2>&1; then # linuxbase.org
OS=$(lsb_release -si) OS=$(lsb_release -si)
VERSION=$(lsb_release -sr) RELEASE=$(lsb_release -sr)
CODENAME=$(lsb_release -sc) CODENAME=$(lsb_release -sc)
DESC=$(lsb_release -sd) DESC=$(lsb_release -sd)
else else
@ -20,13 +20,13 @@ fi
# Set default home for lighttpd, dhcpcd5 and php package option # Set default home for lighttpd, dhcpcd5 and php package option
# based on Linux OS, version # based on Linux OS, version
if [ "$VERSION" -eq "10" ]; then if [ "$RELEASE" -eq "10" ]; then
php_package="php7.3-cgi" php_package="php7.3-cgi"
elif [ "$VERSION" -eq "9" ]; then elif [ "$RELEASE" -eq "9" ]; then
php_package="php7.0-cgi" 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." 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." install_error "${DESC} is unsupported. Please install on a supported distro."
fi fi

6
installers/raspbian.sh
View File

@ -31,7 +31,7 @@
# Set defaults # Set defaults
repo="billz/raspap-webgui" repo="billz/raspap-webgui"
branch="master" 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 assume_yes=0
ovpn_option=1 ovpn_option=1
@ -75,7 +75,7 @@ while :; do
exit 1 exit 1
;; ;;
-v|--version) -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 exit 1
;; ;;
-*|--*) -*|--*)
@ -105,7 +105,7 @@ function display_welcome() {
echo -e " 88 88 88. .88 88 88. .88 88 88 88" echo -e " 88 88 88. .88 88 88. .88 88 88 88"
echo -e " dP dP 88888P8 88888P 88Y888P 88 88 dP" echo -e " dP dP 88888P8 88888P 88Y888P 88 88 dP"
echo -e " 88" echo -e " 88"
echo -e " dP version ${RASPAP_VERSION}" echo -e " dP version ${VERSION}"
echo -e "${green}" echo -e "${green}"
echo -e "The Quick Installer will guide you through a few easy steps\n\n" echo -e "The Quick Installer will guide you through a few easy steps\n\n"
} }