Skip to content

Commit 4c99e2e

Browse files
authored
Fix manual install to use APP_NAME and INSTALL_PATH properly (#972)
1 parent 4f2eac5 commit 4c99e2e

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

rootfs/etc/init.d/bootstrap.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Otherwise present user with bootstrap script to stdout
1+
# Otherwise (if not Atlantis) present user with bootstrap script to stdout
22
gomplate -f /templates/bootstrap
33

44
boot wrapper

rootfs/templates/bootstrap

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/bin/bash
22
export DOCKER_IMAGE="{{getenv "DOCKER_IMAGE" "cloudposse/geodesic"}}"
33
export DOCKER_TAG="{{- getenv "DOCKER_TAG" (printf "${1:-%s-%s}" ((index (getenv "GEODESIC_VERSION" | strings.Split " ") 0) | default "dev") (getenv "GEODESIC_OS" "debian")) -}}"
4-
export APP_NAME=${APP_NAME:-${NAMESPACE:-$(basename ${DOCKER_IMAGE:-geodesic})}}
5-
export INSTALL_PATH=${INSTALL_PATH:-/usr/local/bin}
4+
# export APP_NAME=${APP_NAME:-${NAMESPACE:-$(basename ${DOCKER_IMAGE:-geodesic})}}
5+
export APP_NAME="{{- getenv "APP_NAME" (getenv "NAMESPACE" (path.Base (getenv "DOCKER_IMAGE" "geodesic"))) -}}"
6+
export INSTALL_PATH="{{- getenv "INSTALL_PATH" "/usr/local/bin" -}}"
67
export SAFE_INSTALL_PATH="$HOME/.local/bin" # per XDG recommendations
78
export INSTALLER_NAME="${APP_NAME}-installer"
89
export REQUIRE_PULL=${REQUIRE_PULL:-false}

rootfs/usr/local/bin/boot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ color "# docker run --rm ${DOCKER_IMAGE:-cloudposse/geodesic}:${version} init
3939
color "#"
4040
color "# After that, you should be able to launch Geodesic just by typing"
4141
color "#"
42-
color "# $(basename ${DOCKER_IMAGE:-geodesic})"
42+
color "# ${APP_NAME:-$(basename ${DOCKER_IMAGE:-Geodesic})}"
4343
color "#"
4444
color "########################################################################################"
4545
echo

0 commit comments

Comments
 (0)