diff --git a/scripts/cloudron-setup b/scripts/cloudron-setup index a9f39db22..6dc2bf3fd 100755 --- a/scripts/cloudron-setup +++ b/scripts/cloudron-setup @@ -52,7 +52,7 @@ sourceTarballUrl="" rebootServer="true" baseDataDir="" -args=$(getopt -o "" -l "help,skip-baseimage-init,data-dir:,provider:,version:,env:,edition:,skip-reboot" -n "$0" -- "$@") +args=$(getopt -o "" -l "help,skip-baseimage-init,provider:,version:,env:,edition:,skip-reboot" -n "$0" -- "$@") eval set -- "${args}" while true; do @@ -72,7 +72,6 @@ while true; do shift 2;; --skip-baseimage-init) initBaseImage="false"; shift;; --skip-reboot) rebootServer="false"; shift;; - --data-dir) baseDataDir=$(realpath "$2"); shift 2;; --) break;; *) echo "Unknown option $1"; exit 1;; esac @@ -200,7 +199,7 @@ fi echo "=> Installing version ${version} (this takes some time) ..." echo "${data}" > "${DATA_FILE}" -if ! /bin/bash "${box_src_tmp_dir}/scripts/installer.sh" --data-file "${DATA_FILE}" --data-dir "${baseDataDir}" &>> "${LOG_FILE}"; then +if ! /bin/bash "${box_src_tmp_dir}/scripts/installer.sh" --data-file "${DATA_FILE}" &>> "${LOG_FILE}"; then echo "Failed to install cloudron. See ${LOG_FILE} for details" exit 1 fi diff --git a/scripts/installer.sh b/scripts/installer.sh index 5ded98129..fa2350227 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -23,16 +23,14 @@ readonly box_src_tmp_dir="$(realpath ${script_dir}/..)" readonly is_update=$([[ -f "${CLOUDRON_CONF}" ]] && echo "yes" || echo "no") arg_data="" -arg_data_dir="" -args=$(getopt -o "" -l "data:,data-file:,data-dir:" -n "$0" -- "$@") +args=$(getopt -o "" -l "data:,data-file:," -n "$0" -- "$@") eval set -- "${args}" while true; do case "$1" in --data) arg_data="$2"; shift 2;; --data-file) arg_data=$(cat $2); shift 2;; - --data-dir) arg_data_dir="$2"; shift 2;; --) break;; *) echo "Unknown option $1"; exit 1;; esac @@ -119,15 +117,6 @@ if [[ "${is_update}" == "yes" ]]; then ${BOX_SRC_DIR}/setup/stop.sh fi -# setup links to data directory -if [[ -n "${arg_data_dir}" ]]; then - echo "==> installer: setting up links to data directory" - mkdir "${arg_data_dir}/appsdata" - ln -s "${arg_data_dir}/appsdata" "${BASE_DATA_DIR}/appsdata" - mkdir "${arg_data_dir}/platformdata" - ln -s "${arg_data_dir}/platformdata" "${BASE_DATA_DIR}/platformdata" -fi - # ensure we are not inside the source directory, which we will remove now cd /root