From 2021859b9b7698a5dbb066385e2fd20681bae6b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Mon, 27 Jul 2020 11:34:43 +0200
Subject: turris: fix and improve sftp

It seems that it is not possible to access absolute paths from sftp.
---
 templates/turris.run | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/templates/turris.run b/templates/turris.run
index 0471c0a..9c2bc0c 100755
--- a/templates/turris.run
+++ b/templates/turris.run
@@ -63,10 +63,8 @@ echo_stage "Generate index and sign"
 $make package/index BUILD_KEY=~/openwrt-repo.sec
 
 echo_stage "Deploy"
-sftp -b - upload <<EOF
-	!rm -rf "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"
+sftp -b - upload:/var/www/repo <<EOF
+	!mkdir -p "turris/$ANIMAL"
+	!rm -rf "turris/$ANIMAL/$BOARD"
+	put -R "bin/packages/$ARCH/personal" "/var/www/repo/turris/$ANIMAL/$BOARD"
 EOF
-- 
cgit v1.2.3