From f0c5659bf80d004d228839ee9d969d568ad85fe7 Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Wed, 27 Feb 2019 11:28:04 +1100 Subject: [PATCH] readlink --- credentials/authenticate.sh | 2 +- docker/scripts/alacritty.sh | 2 +- docker/scripts/build.sh | 2 +- docker/scripts/clean-hard.sh | 2 +- docker/scripts/clean-secrets.sh | 2 +- docker/scripts/clean.sh | 2 +- docker/scripts/environment.sh | 2 +- docker/scripts/exec-root.sh | 2 +- docker/scripts/exec.sh | 2 +- docker/scripts/kill-all.sh | 2 +- docker/scripts/pre-clean.sh | 2 +- docker/scripts/push.sh | 2 +- docker/scripts/recycle-hard.sh | 2 +- docker/scripts/recycle-secrets.sh | 2 +- docker/scripts/recycle-xpra.sh | 2 +- docker/scripts/recycle.sh | 2 +- docker/scripts/restart.sh | 2 +- docker/scripts/shell.sh | 2 +- docker/scripts/start-xpra.sh | 2 +- docker/scripts/start.sh | 2 +- docker/scripts/stop.sh | 2 +- docker/scripts/take-ownership.sh | 2 +- docker/scripts/traefik.sh | 2 +- host/bootstrap.sh | 2 +- packer/scripts/build.sh | 2 +- terraform/scripts/start.sh | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/credentials/authenticate.sh b/credentials/authenticate.sh index 73b2d01..3323c93 100755 --- a/credentials/authenticate.sh +++ b/credentials/authenticate.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/.. +REPO_ROOT=$(dirname $(readlink -f $0))/.. # Extract credentials from environment if [ ! -z "$DESKTOP_ENVIRONMENT_CREDENTIALS" ]; then diff --git a/docker/scripts/alacritty.sh b/docker/scripts/alacritty.sh index 791fd87..040067f 100755 --- a/docker/scripts/alacritty.sh +++ b/docker/scripts/alacritty.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Export desktop environment shell configuration export $($REPO_ROOT/docker/scripts/environment.sh) diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh index 9c109ce..04b7d2c 100755 --- a/docker/scripts/build.sh +++ b/docker/scripts/build.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Export desktop environment shell configuration export $($REPO_ROOT/docker/scripts/environment.sh) diff --git a/docker/scripts/clean-hard.sh b/docker/scripts/clean-hard.sh index 425dd13..4dd3f3e 100755 --- a/docker/scripts/clean-hard.sh +++ b/docker/scripts/clean-hard.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Clean secrets and home $REPO_ROOT/docker/scripts/clean-secrets.sh diff --git a/docker/scripts/clean-secrets.sh b/docker/scripts/clean-secrets.sh index 116d15e..c6103d2 100755 --- a/docker/scripts/clean-secrets.sh +++ b/docker/scripts/clean-secrets.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Perform standard clean $REPO_ROOT/docker/scripts/clean.sh diff --git a/docker/scripts/clean.sh b/docker/scripts/clean.sh index 260a32c..9d82f78 100755 --- a/docker/scripts/clean.sh +++ b/docker/scripts/clean.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Stop the running environment so there are no containers using the volumes, ignoring errors if it does not exist $REPO_ROOT/docker/scripts/stop.sh 2>/dev/null diff --git a/docker/scripts/environment.sh b/docker/scripts/environment.sh index a648007..3e91be7 100755 --- a/docker/scripts/environment.sh +++ b/docker/scripts/environment.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Desktop environment user configuration DESKTOP_ENVIRONMENT_CONTAINER=desktop-environment diff --git a/docker/scripts/exec-root.sh b/docker/scripts/exec-root.sh index de53aae..50cb780 100755 --- a/docker/scripts/exec-root.sh +++ b/docker/scripts/exec-root.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Export desktop environment shell configuration export $($REPO_ROOT/docker/scripts/environment.sh) diff --git a/docker/scripts/exec.sh b/docker/scripts/exec.sh index 49e4bda..d86d7a0 100755 --- a/docker/scripts/exec.sh +++ b/docker/scripts/exec.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Export desktop environment shell configuration export $($REPO_ROOT/docker/scripts/environment.sh) diff --git a/docker/scripts/kill-all.sh b/docker/scripts/kill-all.sh index c3e637a..45b0824 100755 --- a/docker/scripts/kill-all.sh +++ b/docker/scripts/kill-all.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Export desktop environment shell configuration export $($REPO_ROOT/docker/scripts/environment.sh) diff --git a/docker/scripts/pre-clean.sh b/docker/scripts/pre-clean.sh index 955af1d..4125156 100755 --- a/docker/scripts/pre-clean.sh +++ b/docker/scripts/pre-clean.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Check for changes to vcsh repositories before removing home volume $REPO_ROOT/docker/scripts/exec.sh "vcsh status | grep -qE \"^ M \" -" diff --git a/docker/scripts/push.sh b/docker/scripts/push.sh index f34dffb..808beb0 100755 --- a/docker/scripts/push.sh +++ b/docker/scripts/push.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Export desktop environment shell configuration export $($REPO_ROOT/docker/scripts/environment.sh) diff --git a/docker/scripts/recycle-hard.sh b/docker/scripts/recycle-hard.sh index f9ce0ab..58a3906 100755 --- a/docker/scripts/recycle-hard.sh +++ b/docker/scripts/recycle-hard.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Rebuild the desktop environment $REPO_ROOT/docker/scripts/build.sh diff --git a/docker/scripts/recycle-secrets.sh b/docker/scripts/recycle-secrets.sh index 01a04f2..0c945c8 100755 --- a/docker/scripts/recycle-secrets.sh +++ b/docker/scripts/recycle-secrets.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Rebuild the desktop environment container $REPO_ROOT/docker/scripts/build.sh diff --git a/docker/scripts/recycle-xpra.sh b/docker/scripts/recycle-xpra.sh index 5d19b9c..df36398 100755 --- a/docker/scripts/recycle-xpra.sh +++ b/docker/scripts/recycle-xpra.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Rebuild the desktop environment $REPO_ROOT/docker/scripts/build.sh diff --git a/docker/scripts/recycle.sh b/docker/scripts/recycle.sh index 8408ca4..bc6a07f 100755 --- a/docker/scripts/recycle.sh +++ b/docker/scripts/recycle.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Rebuild the desktop environment $REPO_ROOT/docker/scripts/build.sh diff --git a/docker/scripts/restart.sh b/docker/scripts/restart.sh index 27f11f5..1f8dab2 100755 --- a/docker/scripts/restart.sh +++ b/docker/scripts/restart.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. $REPO_ROOT/docker/scripts/stop.sh $REPO_ROOT/docker/scripts/start.sh diff --git a/docker/scripts/shell.sh b/docker/scripts/shell.sh index a56547a..7021a89 100755 --- a/docker/scripts/shell.sh +++ b/docker/scripts/shell.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Export desktop environment shell configuration export $($REPO_ROOT/docker/scripts/environment.sh) diff --git a/docker/scripts/start-xpra.sh b/docker/scripts/start-xpra.sh index eb91580..9eb969a 100755 --- a/docker/scripts/start-xpra.sh +++ b/docker/scripts/start-xpra.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Export desktop environment shell configuration export $($REPO_ROOT/docker/scripts/environment.sh) diff --git a/docker/scripts/start.sh b/docker/scripts/start.sh index ea1414b..7d63fdf 100755 --- a/docker/scripts/start.sh +++ b/docker/scripts/start.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Export desktop environment shell configuration export $($REPO_ROOT/docker/scripts/environment.sh) diff --git a/docker/scripts/stop.sh b/docker/scripts/stop.sh index 635bfca..e9bd96d 100755 --- a/docker/scripts/stop.sh +++ b/docker/scripts/stop.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Export desktop environment shell configuration export $($REPO_ROOT/docker/scripts/environment.sh) diff --git a/docker/scripts/take-ownership.sh b/docker/scripts/take-ownership.sh index d44eb75..1689009 100755 --- a/docker/scripts/take-ownership.sh +++ b/docker/scripts/take-ownership.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Export desktop environment shell configuration export $($REPO_ROOT/docker/scripts/environment.sh) diff --git a/docker/scripts/traefik.sh b/docker/scripts/traefik.sh index 436f992..eda1fac 100755 --- a/docker/scripts/traefik.sh +++ b/docker/scripts/traefik.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Export desktop environment shell configuration export $($REPO_ROOT/docker/scripts/environment.sh) diff --git a/host/bootstrap.sh b/host/bootstrap.sh index 5aa2517..ade0895 100755 --- a/host/bootstrap.sh +++ b/host/bootstrap.sh @@ -4,7 +4,7 @@ if [ $USER != "root" ]; then exit 1 fi -REPO_ROOT=$(dirname $(realpath $0))/.. +REPO_ROOT=$(dirname $(readlink -f $0))/.. # Export desktop environment shell configuration export $($REPO_ROOT/docker/scripts/environment.sh) diff --git a/packer/scripts/build.sh b/packer/scripts/build.sh index 4003b19..a9c991b 100755 --- a/packer/scripts/build.sh +++ b/packer/scripts/build.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Export desktop environment shell configuration export $($REPO_ROOT/docker/scripts/environment.sh) diff --git a/terraform/scripts/start.sh b/terraform/scripts/start.sh index 81054ad..624867c 100755 --- a/terraform/scripts/start.sh +++ b/terraform/scripts/start.sh @@ -1,4 +1,4 @@ -REPO_ROOT=$(dirname $(realpath $0))/../.. +REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Export desktop environment shell configuration export $($REPO_ROOT/docker/scripts/environment.sh)