diff --git a/installers/common.sh b/installers/common.sh index 013018c7..2fff1f30 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -34,7 +34,16 @@ if [ "$insiders" == 1 ]; then repo="RaspAP/raspap-insiders" branch=${RASPAP_INSIDERS_LATEST} fi -git_source_url="https://github.com/$repo" + +#Use ssh IF $ssh is set AND $username and $acctoken IS NOT set +if [ -n "$username" ] && [ -n "$acctoken" ]; then + git_source_url="https://${username}:${acctoken}@github.com/$repo" + ssh=0 +elif [ "$ssh" == 1 ]; then + git_source_url="git@github.com:$repo" +else + git_source_url="https://github.com/$repo" +fi webroot_dir="/var/www/html" # NOTE: all the below functions are overloadable for system-specific installs @@ -277,8 +286,8 @@ function _install_dependencies() { sudo apt-get install -y lighttpd git hostapd dnsmasq iptables-persistent $php_package $dhcpcd_package $iw_package $rsync_package $network_tools $ifconfig_package vnstat qrencode jq isoquery || _install_status 1 "Unable to install dependencies" if [[ "$php_package" == *"-fpm" ]]; then - install_log "Enabling lighttpd fastcgi-php-fpm module for $php_package" - sudo lighty-enable-mod fastcgi-php-fpm || install_status 1 "Unable to enable fastcgi-php-fpm module" + _install_log "Enabling lighttpd fastcgi-php-fpm module for $php_package" + sudo lighty-enable-mod fastcgi-php-fpm || _install_status 1 "Unable to enable fastcgi-php-fpm module" fi _install_status 0 @@ -605,22 +614,16 @@ function _download_latest_files() { source_dir="/tmp/raspap-webgui" if [ -d "$source_dir" ]; then echo "Temporary download destination $source_dir exists. Removing..." - rm -r "$source_dir" + rm -rf "$source_dir" fi - if [ "$repo" == "RaspAP/raspap-insiders" ]; then - if [ -n "$username" ] && [ -n "$acctoken" ]; then - insiders_source_url="https://${username}:${acctoken}@github.com/$repo" - git clone --branch $branch --depth 1 --recurse-submodules -c advice.detachedHead=false $insiders_source_url $source_dir || clone=false - git -C $source_dir submodule update --remote plugins || clone=false - else - _install_status 3 - echo "Insiders please read this: https://docs.raspap.com/insiders/#authentication" - fi - fi - if [ -z "$insiders_source_url" ]; then - git clone --branch $branch --depth 1 --recurse-submodules -c advice.detachedHead=false $git_source_url $source_dir || clone=false - git -C $source_dir submodule update --remote plugins || clone=false + if [ "$insiders" == 1 ] && [ "$ssh" != 1 ] && [[ -z "$username" || -z "$acctoken" ]]; then + _install_status 3 + _install_status 0 "Insiders please read this: https://docs.raspap.com/insiders/#authentication" fi + + git clone --branch $branch --depth 1 --recurse-submodules -c advice.detachedHead=false $git_source_url $source_dir || clone=false + git -C $source_dir submodule update --remote plugins || clone=false + if [ "$clone" = false ]; then _install_status 1 "Unable to download files from GitHub" echo "The installer cannot continue." >&2 diff --git a/installers/raspbian.sh b/installers/raspbian.sh index c65a3568..fe368670 100755 --- a/installers/raspbian.sh +++ b/installers/raspbian.sh @@ -49,6 +49,7 @@ OPTIONS: -b, --branch Overrides the default git branch (latest release) -t, --token Specify a GitHub token to access a private repository -n, --name Specify a GitHub username to access a private repository +-x, --use-ssh Use ssh instead of https for git -u, --upgrade Upgrades an existing installation to the latest release version -d, --update Updates an existing installation to the latest release version -p, --path Used with -d, --update, sets the existing install path @@ -56,7 +57,7 @@ OPTIONS: -m, --minwrite Configures a microSD card for minimum write operation -k, --check Sets the connectivity check flag (default is 1=perform check) -v, --version Outputs release info and exits --n, --uninstall Loads and executes the uninstaller +-z, --uninstall Loads and executes the uninstaller -h, --help Outputs usage notes and exits Examples: @@ -106,6 +107,7 @@ function _parse_params() { adblock_option=1 wg_option=1 insiders=0 + ssh=0 minwrite=0 acctoken="" path="" @@ -165,6 +167,9 @@ function _parse_params() { -m|--minwrite) minwrite=1 ;; + -x|--use-ssh) + ssh=1 + ;; -t|--token) acctoken="$2" shift @@ -187,7 +192,7 @@ function _parse_params() { -v|--version) _version ;; - -n|--uninstall) + -z|--uninstall) uninstall=1 ;; -*|--*)