summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rwxr-xr-xtemplates/alpine.run9
-rwxr-xr-xtemplates/turris.run4
2 files changed, 10 insertions, 3 deletions
diff --git a/templates/alpine.run b/templates/alpine.run
index a65fb84..2132576 100755
--- a/templates/alpine.run
+++ b/templates/alpine.run
@@ -69,9 +69,14 @@ uchroot build 'buildrepo --purge --keep-going personal'
echo_stage "Deploy"
ssh upload rm -rf "deploy-alpine"
-sftp -r "$WORKSPACE/packages/personal/$ARCH" upload:"deploy-alpine-$ARCH"
+sftp -b - upload <<EOF
+ put -R "$WORKSPACE/packages/personal/$ARCH" "deploy-alpine-$ARCH"
+EOF
ssh upload /bin/sh -e "$ARCH" <<"EOF"
rm -rf "/var/www/repo/alpine/$1"
mv "deploy-alpine-$1" "/var/www/repo/alpine/$1"
EOF
-sftp "$FILES"/alpine/setup.sh{,.gpg} upload:/var/www/repo/alpine/
+sftp -b - upload:/var/www/repo/alpine/ <<EOF
+ put "$FILES"/alpine/setup.sh"
+ put "$FILES"/alpine/setup.sh.gpg"
+EOF
diff --git a/templates/turris.run b/templates/turris.run
index 01ff8e3..19295a5 100755
--- a/templates/turris.run
+++ b/templates/turris.run
@@ -69,7 +69,9 @@ $make package/index BUILD_KEY=~/openwrt-repo.sec
echo_stage "Deploy"
ssh upload rm -rf "deploy-turris-$ANIMAL-$BOARD"
-sftp -r "bin/packages/$ARCH/personal" upload:"deploy-turris-$ANIMAL-$BOARD"
+sftp -d - upload <<EOF
+ put -R "./bin/packages/$ARCH/personal" "deploy-turris-$ANIMAL-$BOARD"
+EOF
ssh upload /bin/sh -e "$ANIMAL" "$BOARD" <<"EOF"
mkdir -p "/var/www/repo/turris/$1"
rm -rf "/var/www/repo/turris/$1/$2"