From 95350c5a86eaa3dd3979057f1ac02c3db0d05002 Mon Sep 17 00:00:00 2001 From: Kroese Date: Wed, 24 May 2023 12:45:35 +0200 Subject: [PATCH] Upgrade fixes --- run/install.sh | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/run/install.sh b/run/install.sh index 5b67e2e..c9943fa 100644 --- a/run/install.sh +++ b/run/install.sh @@ -124,12 +124,9 @@ PKG="$TMP/packages" HDP="$TMP/synohdpack_img" [ ! -f "$HDA.tgz" ] && error "The PAT file contains no OS image." && exit 64 -[ ! -f "$HDP.txz" ] && error "The PAT file contains no HD pack." && exit 65 -[ ! -f "$IDB.txz" ] && error "The PAT file contains no IndexDB." && exit 66 -[ ! -d "$PKG" ] && error "The PAT file contains no packages." && exit 68 BOOT=$(find "$TMP" -name "*.bin.zip") -[ ! -f "$BOOT" ] && error "The PAT file contains no boot file." && exit 67 +[ ! -f "$BOOT" ] && error "The PAT file contains no boot image." && exit 67 BOOT=$(echo "$BOOT" | head -c -5) unzip -q -o "$BOOT".zip -d "$TMP" @@ -179,12 +176,13 @@ MOUNT="$TMP/system" rm -rf "$MOUNT" && mkdir -p "$MOUNT" mv "$HDA.tgz" "$HDA.txz" -mv "$PKG/" "$MOUNT/.SynoUpgradePackages/" -rm -f "$MOUNT/.SynoUpgradePackages/ActiveInsight-"* - -tar xpfJ "$HDP.txz" --absolute-names -C "$MOUNT/" tar xpfJ "$HDA.txz" --absolute-names -C "$MOUNT/" -tar xpfJ "$IDB.txz" --absolute-names -C "$MOUNT/usr/syno/synoman/indexdb/" + +[ -d "$PKG" ] && mv "$PKG/" "$MOUNT/.SynoUpgradePackages/" +[ -d "$MOUNT/.SynoUpgradePackages/" ] && rm -f "$MOUNT/.SynoUpgradePackages/ActiveInsight-"* + +[ -f "$IDB.txz" ] && mv "$IDB.txz" "$MOUNT/.SynoUpgradeIndexdb.txz" +[ -f "$HDP.txz" ] && mv "$HDP.txz" "$MOUNT/.SynoUpgradeSynohdpackImg.txz" # Install Agent