summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2020-07-29 18:04:59 +0200
committerKarel Kočí <cynerd@email.cz>2020-07-29 18:04:59 +0200
commitc1cf66353d7e9ad014a10c4c69e5e279732c5d60 (patch)
tree0b35f883cf217bc63a50636b9f6f0fae73cd73bc
parent55dde5308611c987f7573da4d7c9310588ac1a7a (diff)
downloadlaminar-cnf-c1cf66353d7e9ad014a10c4c69e5e279732c5d60.tar.gz
laminar-cnf-c1cf66353d7e9ad014a10c4c69e5e279732c5d60.tar.bz2
laminar-cnf-c1cf66353d7e9ad014a10c4c69e5e279732c5d60.zip
Fix invalid usage of shell spawning
-rwxr-xr-xtemplates/alpine.run2
-rwxr-xr-xtemplates/turris.run2
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/alpine.run b/templates/alpine.run
index 2132576..2779607 100755
--- a/templates/alpine.run
+++ b/templates/alpine.run
@@ -72,7 +72,7 @@ ssh upload rm -rf "deploy-alpine"
sftp -b - upload <<EOF
put -R "$WORKSPACE/packages/personal/$ARCH" "deploy-alpine-$ARCH"
EOF
-ssh upload /bin/sh -e "$ARCH" <<"EOF"
+ssh upload /bin/sh -se "$ARCH" <<"EOF"
rm -rf "/var/www/repo/alpine/$1"
mv "deploy-alpine-$1" "/var/www/repo/alpine/$1"
EOF
diff --git a/templates/turris.run b/templates/turris.run
index e8dfb22..9135f01 100755
--- a/templates/turris.run
+++ b/templates/turris.run
@@ -72,7 +72,7 @@ ssh upload rm -rf "deploy-turris-$ANIMAL-$BOARD"
sftp -b - upload <<EOF
put -R "./bin/packages/$ARCH/personal" "deploy-turris-$ANIMAL-$BOARD"
EOF
-ssh upload /bin/sh -e "$ANIMAL" "$BOARD" <<"EOF"
+ssh upload /bin/sh -se "$ANIMAL" "$BOARD" <<"EOF"
mkdir -p "/var/www/repo/turris/$1"
rm -rf "/var/www/repo/turris/$1/$2"
mv "deploy-turris-$1-$2" "/var/www/repo/turris/$1/$2"