From eaadffe07b0516f103321c84013b755061ba7fb5 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Thu, 4 May 2017 16:05:19 -0400 Subject: [PATCH] Always have ./clean.sh run ./unstack.sh There was detection code in clean.sh to only run it if a screen session was found, but in systemd world, that's obviously not true. This was causing me (and others) substantial confusion. Change-Id: I204e94cd86b8c67012aabfca74796e593151c3a4 --- clean.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/clean.sh b/clean.sh index 90b21eb353..ef38fbf4f8 100755 --- a/clean.sh +++ b/clean.sh @@ -64,13 +64,8 @@ if [[ -d $TOP_DIR/extras.d ]]; then done fi -# See if there is anything running... -# need to adapt when run_service is merged -SESSION=$(screen -ls | awk '/[0-9].stack/ { print $1 }') -if [[ -n "$SESSION" ]]; then - # Let unstack.sh do its thing first - $TOP_DIR/unstack.sh --all -fi +# Let unstack.sh do its thing first +$TOP_DIR/unstack.sh --all # Run extras # ==========