From 11330b0364e20772691a9d54f09f58c94d4d2ebf Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Wed, 16 Oct 2019 11:05:23 +1100 Subject: [PATCH] path --- docker/scripts/clean-hard.sh | 3 --- docker/scripts/clean-secrets.sh | 9 --------- docker/scripts/environment.sh | 2 +- docker/scripts/recycle-dotfiles.sh | 3 +-- docker/scripts/recycle-hard.sh | 3 +-- docker/scripts/recycle-secrets.sh | 12 ------------ docker/scripts/recycle.sh | 3 +-- docker/scripts/restart.sh | 1 - 8 files changed, 4 insertions(+), 32 deletions(-) delete mode 100755 docker/scripts/clean-secrets.sh delete mode 100755 docker/scripts/recycle-secrets.sh diff --git a/docker/scripts/clean-hard.sh b/docker/scripts/clean-hard.sh index ff342cc..2a289f3 100755 --- a/docker/scripts/clean-hard.sh +++ b/docker/scripts/clean-hard.sh @@ -1,8 +1,5 @@ REPO_ROOT=$(dirname $(readlink -f $0))/../.. -# Clean secrets and home -$REPO_ROOT/docker/scripts/clean-secrets.sh - # Remove volumes that can be recreated from scratch, but require manual configuration in app $REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_CHROME & $REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_CODE & diff --git a/docker/scripts/clean-secrets.sh b/docker/scripts/clean-secrets.sh deleted file mode 100755 index 0a95e10..0000000 --- a/docker/scripts/clean-secrets.sh +++ /dev/null @@ -1,9 +0,0 @@ -REPO_ROOT=$(dirname $(readlink -f $0))/../.. - -# Clean volumes containing private data -$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_CACHE_GDRIVE & -$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_STATE_SIGNAL & -$REPO_ROOT/docker/scripts/wipe-volume.sh DESKTOP_ENVIRONMENT_CACHE_SSH & - -# Wait for cleans to complete in parallel -wait diff --git a/docker/scripts/environment.sh b/docker/scripts/environment.sh index f472487..bca8149 100755 --- a/docker/scripts/environment.sh +++ b/docker/scripts/environment.sh @@ -42,7 +42,7 @@ echo export DESKTOP_ENVIRONMENT_CACHE_ZSH=$DESKTOP_ENVIRONMENT_USER_HOME/.cache/ echo export DESKTOP_ENVIRONMENT_STATE_CHROME=$DESKTOP_ENVIRONMENT_USER_HOME/.config/google-chrome echo export DESKTOP_ENVIRONMENT_STATE_CODE=$DESKTOP_ENVIRONMENT_USER_HOME/.config/Code echo export DESKTOP_ENVIRONMENT_STATE_GITHUB=$DESKTOP_ENVIRONMENT_USER_HOME/.config/github -echo export DESKTOP_ENVIRONMENT_STATE_JUMP=$DESKTOP_ENVIRONMENT_USER_HOME/.local/share/autojump +echo export DESKTOP_ENVIRONMENT_STATE_JUMP=$DESKTOP_ENVIRONMENT_USER_HOME/.jump echo export DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE=$DESKTOP_ENVIRONMENT_USER_HOME/.musikcube echo export DESKTOP_ENVIRONMENT_STATE_RESCUETIME=$DESKTOP_ENVIRONMENT_USER_HOME/.config/RescueTime.com echo export DESKTOP_ENVIRONMENT_STATE_SIGNAL=$DESKTOP_ENVIRONMENT_USER_HOME/.config/Signal diff --git a/docker/scripts/recycle-dotfiles.sh b/docker/scripts/recycle-dotfiles.sh index f28058e..9d6d65b 100755 --- a/docker/scripts/recycle-dotfiles.sh +++ b/docker/scripts/recycle-dotfiles.sh @@ -7,5 +7,4 @@ $REPO_ROOT/docker/scripts/build-dotfiles.sh $REPO_ROOT/docker/scripts/pre-clean.sh # Reset the desktop environment state -$REPO_ROOT/docker/scripts/start.sh -$REPO_ROOT/docker/scripts/alacritty.sh +$REPO_ROOT/docker/scripts/restart.sh diff --git a/docker/scripts/recycle-hard.sh b/docker/scripts/recycle-hard.sh index 58a3906..d0f5ac0 100755 --- a/docker/scripts/recycle-hard.sh +++ b/docker/scripts/recycle-hard.sh @@ -8,5 +8,4 @@ $REPO_ROOT/docker/scripts/pre-clean.sh # Reset the desktop environment state $REPO_ROOT/docker/scripts/clean-hard.sh -$REPO_ROOT/docker/scripts/start.sh -$REPO_ROOT/docker/scripts/alacritty.sh +$REPO_ROOT/docker/scripts/restart.sh diff --git a/docker/scripts/recycle-secrets.sh b/docker/scripts/recycle-secrets.sh deleted file mode 100755 index 0c945c8..0000000 --- a/docker/scripts/recycle-secrets.sh +++ /dev/null @@ -1,12 +0,0 @@ -REPO_ROOT=$(dirname $(readlink -f $0))/../.. - -# Rebuild the desktop environment container -$REPO_ROOT/docker/scripts/build.sh - -# Check for data loss before recycling -$REPO_ROOT/docker/scripts/pre-clean.sh - -# Reset the desktop environment state -$REPO_ROOT/docker/scripts/clean-secrets.sh -$REPO_ROOT/docker/scripts/start.sh -$REPO_ROOT/docker/scripts/alacritty.sh diff --git a/docker/scripts/recycle.sh b/docker/scripts/recycle.sh index d43eee8..84e0ca9 100755 --- a/docker/scripts/recycle.sh +++ b/docker/scripts/recycle.sh @@ -7,5 +7,4 @@ $REPO_ROOT/docker/scripts/build.sh $REPO_ROOT/docker/scripts/pre-clean.sh # Reset the desktop environment state -$REPO_ROOT/docker/scripts/start.sh -$REPO_ROOT/docker/scripts/alacritty.sh +$REPO_ROOT/docker/scripts/restart.sh diff --git a/docker/scripts/restart.sh b/docker/scripts/restart.sh index 1f8dab2..085f666 100755 --- a/docker/scripts/restart.sh +++ b/docker/scripts/restart.sh @@ -2,4 +2,3 @@ REPO_ROOT=$(dirname $(readlink -f $0))/../.. $REPO_ROOT/docker/scripts/stop.sh $REPO_ROOT/docker/scripts/start.sh -$REPO_ROOT/docker/scripts/alacritty.sh