From d035fc804d5a35d5bcf10eac8a72fb12882b26a1 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 23 Aug 2023 19:44:59 +0200 Subject: [PATCH] Update _install_status w/ ! important + add Insiders note --- installers/common.sh | 20 +++++++++++++++----- installers/raspbian.sh | 4 +++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/installers/common.sh b/installers/common.sh index ade4e546..89cc0f26 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -490,6 +490,10 @@ function _download_latest_files() { fi _install_log "Cloning latest files from github" + if [ "$repo" == "RaspAP/raspap-insiders" ]; then + _install_status 3 + echo "Insiders please read this: https://docs.raspap.com/insiders/#authentication" + fi git clone --branch $branch --depth 1 -c advice.detachedHead=false $git_source_url /tmp/raspap-webgui || _install_status 1 "Unable to download files from github" sudo mv /tmp/raspap-webgui $webroot_dir || _install_status 1 "Unable to move raspap-webgui to web root" @@ -747,11 +751,17 @@ function _optimize_php() { function _install_complete() { _install_log "Installation completed" - echo "Join RaspAP Insiders for early access to exclusive features!" - echo -e "${ANSI_RASPBERRY}" - echo "> https://docs.raspap.com/insiders/" - echo "> https://github.com/sponsors/RaspAP/" - echo -e "${ANSI_RESET}" + if [ "$repo" == "RaspAP/raspap-insiders" ]; then + echo -e "${ANSI_RASPBERRY}" + echo "Thank you for supporting this project as an Insider!" + echo -e "${ANSI_RESET}" + else + echo "Join RaspAP Insiders for early access to exclusive features!" + echo -e "${ANSI_RASPBERRY}" + echo "> https://docs.raspap.com/insiders/" + echo "> https://github.com/sponsors/RaspAP/" + echo -e "${ANSI_RESET}" + fi if [ "$assume_yes" == 0 ]; then # Prompt to reboot if wired ethernet (eth0) is connected. # With default_configuration this will create an active AP on restart. diff --git a/installers/raspbian.sh b/installers/raspbian.sh index 91324d6e..a8839814 100755 --- a/installers/raspbian.sh +++ b/installers/raspbian.sh @@ -1,4 +1,4 @@ -#!/bin/bash +e!/bin/bash # # RaspAP Quick Installer # Author: @billz @@ -234,6 +234,8 @@ function _install_status() { 2) echo -e "[$ANSI_YELLOW \U26A0 warning $ANSI_RESET] $2" ;; + 3) + echo -e "[$ANSI_RASPBERRY ! important $ANSI_RESET] $2" esac }