diff --git a/install.sh b/install.sh index 349166b..8643df3 100755 --- a/install.sh +++ b/install.sh @@ -133,12 +133,15 @@ discover_services() { check_dirs_and_files() { if [ ! -f "$HOME/.ssh/installer" ]; then - echo "No ssh key files found, exting"; - exit; - else - chmod 0600 $HOME/.ssh/installer; - chmod 0600 $HOME/.ssh/installer.pub; + echo "No ssh key files found. Please paste base64 content of the installer private key: "; + while read -r INSTALLER; do + if [ "$INSTALLER" != "" ]; then + break; + fi; + done + echo $INSTALLER > $HOME/.ssh/installer; fi; + chmod 0600 $HOME/.ssh/installer; if [ ! -d "/etc/user/config" ]; then $SUDO_CMD mkdir -p "/etc/user/config" @@ -665,9 +668,6 @@ if [ "$DOCKER_REGISTRY_URL" == "" ]; then DOCKER_REGISTRY_URL="registry.format.hu"; fi -$SUDO_CMD docker pull $DOCKER_REGISTRY_URL/installer-tool -$SUDO_CMD docker pull $DOCKER_REGISTRY_URL/setup - # first install if [ ! -f "/etc/user/config/system.json" ]; then @@ -744,6 +744,10 @@ if [ ! -f "/etc/user/config/system.json" ]; then --env LETSENCRYPT_MAIL=$LETSENCRYPT_MAIL \ --env LETSENCRYPT_SERVERNAME=$LETSENCRYPT_SERVERNAME \ $DOCKER_REGISTRY_URL/installer-tool +else + + $SUDO_CMD docker pull $DOCKER_REGISTRY_URL/installer-tool + $SUDO_CMD docker pull $DOCKER_REGISTRY_URL/setup fi;