summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/cycle.sh16
-rw-r--r--strata/core.morph4
2 files changed, 10 insertions, 10 deletions
diff --git a/scripts/cycle.sh b/scripts/cycle.sh
index 3d1b45fe..0198c1f9 100755
--- a/scripts/cycle.sh
+++ b/scripts/cycle.sh
@@ -29,7 +29,7 @@ if [ -z "$1" ] || [ -z "$2" ] ; then
exit 1
fi
-if [ `system-version-manager get-running | grep ^TEST$` ]; then
+if system-version-manager get-running | grep -q '^TEST$'; then
echo "You are currently running the TEST system."
echo "Maybe you want to boot into a different system version?"
exit 1
@@ -38,13 +38,13 @@ fi
set -e
set -v
-system-version-manager set-default factory
-if [ `system-version-manager list | grep ^TEST$` ]; then
- system-version-manager remove TEST
-fi
+system-version-manager set-default factory
+if system-version-manager list | grep -q '^TEST$'; then
+ system-version-manager remove TEST
+fi
morph gc
-morph build $1
+morph build "$1"
-sed -i "s|^- morph: .*$|- morph: $1|" $2
-morph deploy --upgrade $2 self.HOSTNAME=$(hostname) self.VERSION_LABEL=TEST
+sed -i "s|^- morph: .*$|- morph: $1|" "$2"
+morph deploy --upgrade "$2" self.HOSTNAME=$(hostname) self.VERSION_LABEL=TEST
diff --git a/strata/core.morph b/strata/core.morph
index 0f660b5a..5c90c964 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -123,8 +123,8 @@ chunks:
- name: cpython
morph: strata/core/cpython.morph
repo: upstream:cpython
- ref: 1aaa7cd8880727716883d75783dc0569f3e4238b
- unpetrify-ref: v2.7.2
+ ref: 0b92c75574adef1e1ccf1b635a3724a86b567cd2
+ unpetrify-ref: v2.7.8
build-depends:
- openssl-new
- bzip2