From 50a7aedf7c9978dfafad0ee88948e207bcbed12c Mon Sep 17 00:00:00 2001 From: MichaIng Date: Sun, 14 Feb 2021 19:40:35 +0100 Subject: [PATCH] v6.35 + DietPi-Update | "DietPi-$GITBRANCH_TARGET/dietpi/server_version" does not exist anymore on v7 branches --- dietpi/dietpi-update | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dietpi/dietpi-update b/dietpi/dietpi-update index 48554745d4..8e6ae1ef98 100644 --- a/dietpi/dietpi-update +++ b/dietpi/dietpi-update @@ -234,11 +234,11 @@ rm "$GITBRANCH_TARGET.tar.gz" # Remove files from Git archive that are not to be installed on client - rm DietPi-"$GITBRANCH_TARGET"/dietpi/{pre-patch_file,server_version*} + rm "DietPi-$GITBRANCH_TARGET/dietpi/"{pre-patch_file,server_version-6} - G_EXEC_DESC='Installing new DietPi scripts' G_EXEC cp -Rf DietPi-"$GITBRANCH_TARGET"/dietpi /boot/ - G_EXEC_DESC='Installing new DietPi system files' G_EXEC cp -Rf DietPi-"$GITBRANCH_TARGET"/rootfs/. / - G_EXEC_DESC='Setting execute permissions for DietPi scripts' G_EXEC chmod -R +x /boot/dietpi /var/lib/dietpi/services /etc/cron.*/dietpi DietPi-"$GITBRANCH_TARGET"/.update/patches + G_EXEC_DESC='Installing new DietPi scripts' G_EXEC cp -Rf "DietPi-$GITBRANCH_TARGET/dietpi" /boot/ + G_EXEC_DESC='Installing new DietPi system files' G_EXEC cp -Rf "DietPi-$GITBRANCH_TARGET/rootfs/." / + G_EXEC_DESC='Setting execute permissions for DietPi scripts' G_EXEC chmod -R +x /boot/dietpi /var/lib/dietpi/services /etc/cron.*/dietpi "DietPi-$GITBRANCH_TARGET/.update/patches" # Save version + Git info now for sub scripts to pull from correct branch G_GITOWNER=$GITOWNER_TARGET