summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2020-07-27 07:56:46 +0200
committerKarel Kočí <cynerd@email.cz>2020-07-27 07:56:46 +0200
commit6a4f4062e506ec90b27907a2fc6c855b42ec0989 (patch)
tree1d490e40249c23c03a77ce21002316d0e7d4f31c
parentb5308f5d1b2213c04fd79286133227270587a6e2 (diff)
downloadlaminar-cnf-6a4f4062e506ec90b27907a2fc6c855b42ec0989.tar.gz
laminar-cnf-6a4f4062e506ec90b27907a2fc6c855b42ec0989.tar.bz2
laminar-cnf-6a4f4062e506ec90b27907a2fc6c855b42ec0989.zip
sftp use -R instead of -r globally
-rwxr-xr-xtemplates/alpine.run4
-rwxr-xr-xtemplates/turris.run4
2 files changed, 4 insertions, 4 deletions
diff --git a/templates/alpine.run b/templates/alpine.run
index 18b2c55..dce5dda 100755
--- a/templates/alpine.run
+++ b/templates/alpine.run
@@ -68,9 +68,9 @@ uroot cp "$FILES/alpine/abuild.conf" "$ROOT/etc/abuild.conf"
uchroot build 'buildrepo --purge --keep-going personal'
echo_stage "Deploy"
-sftp -r -b - upload <<EOF
+sftp -b - upload <<EOF
!rm -rf "deploy-alpine-$ARCH"
- put "$WORKSPACE/packages/personal/$ARCH" "deploy-alpine-$ARCH"
+ put -R "$WORKSPACE/packages/personal/$ARCH" "deploy-alpine-$ARCH"
!rm -rf "/var/www/repo/alpine/$ARCH"
mv "deploy-alpine-$ARCH" "/var/www/repo/alpine/$ARCH"
diff --git a/templates/turris.run b/templates/turris.run
index 81e03f1..2bbf4c4 100755
--- a/templates/turris.run
+++ b/templates/turris.run
@@ -63,9 +63,9 @@ echo_stage "Generate index and sign"
$make package/index BUILD_KEY=~/openwrt-repo.sec
echo_stage "Deploy"
-sftp -r -d - upload <<EOF
+sftp -d - upload <<EOF
!rm -rf "deploy-turris-$ANIMAL-$BOARD"
- put "bin/packages/$ARCH/personal" "deploy-turris-$ANIMAL-$BOARD"
+ put -R "bin/packages/$ARCH/personal" "deploy-turris-$ANIMAL-$BOARD"
!mkdir -p "/var/www/repo/turris/$ANIMAL"
!rm -rf "/var/www/repo/turris/$ANIMAL/$BOARD"
mv "deploy-turris-$ANIMAL-$BOARD" "/var/www/repo/turris/$ANIMAL/$BOARD"