Browse code
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
Sean Dague authored on 2017/05/05 05:05:19Showing 1 changed files
| ... | ... |
@@ -64,13 +64,8 @@ if [[ -d $TOP_DIR/extras.d ]]; then |
| 64 | 64 |
done |
| 65 | 65 |
fi |
| 66 | 66 |
|
| 67 |
-# See if there is anything running... |
|
| 68 |
-# need to adapt when run_service is merged |
|
| 69 |
-SESSION=$(screen -ls | awk '/[0-9].stack/ { print $1 }')
|
|
| 70 |
-if [[ -n "$SESSION" ]]; then |
|
| 71 |
- # Let unstack.sh do its thing first |
|
| 72 |
- $TOP_DIR/unstack.sh --all |
|
| 73 |
-fi |
|
| 67 |
+# Let unstack.sh do its thing first |
|
| 68 |
+$TOP_DIR/unstack.sh --all |
|
| 74 | 69 |
|
| 75 | 70 |
# Run extras |
| 76 | 71 |
# ========== |