Merge pull request #1771 from nextcloud/devel

Add support for Nextcloud 26

bin/ncp-restore

@@ -60,7 +60,7 @@ if [[ -n "$DATA_BKP_DIR" ]]
 then
   target="$NCDIR/data"
   [[ -d "$target" ]] && {
-    target="$NCDIR/.data_$(date -I)"
+    target="$NCDIR/.data_$(date '+%FT%s')"
     echo "DATA CONFLICT! Your old '$NCDIR/data' directory can be found in '$target' after the restore script is done. The new '$NCDIR/data' directory will be restored from the backup. You can manually merge these directories with this command (run nc-fix-permissions and nc-scan afterwards): cp -rn '$target/'* '$target/'.[!.]* '$NCDIR/data/'"
   }
   echo "Restoring old '$NCDIR/data' to '$target'..."
@@ -108,8 +108,9 @@ NUMFILES=2
 if [[ $( ls "$TMPDIR" | wc -l ) -eq $NUMFILES ]]; then
 
   [[ -e "$DATADIR" ]] && {
-    echo "backing up existing $DATADIR to $DATADIR-$( date -I )..."
-    mv "$DATADIR" "$DATADIR-$( date -I )" || exit 1
+    bk_target="$DATADIR-$( date '+%FT%s' )"
+    echo "backing up existing $DATADIR to ${bk_target}..."
+    mv "$DATADIR" "${bk_target}" || exit 1
   }
 
   echo "restore datadir to $DATADIR..."

build/build-docker.sh

@@ -19,12 +19,13 @@ build_arch() {
   local suffix="${5:-$arch}"
 
   echo -e "\e[1m\n[ Build NCP Docker ${arch} ]\e[0m"
+  version="${version?}"
   DOCKER_BUILDKIT=1 docker build --pull --progress=plain . -f build/docker/Dockerfile \
     --target "$target" -t "ownyourbits/$target-${suffix}:latest" \
     --cache-from "ownyourbits/nextcloudpi-${suffix}" --build-arg "release=$release" --build-arg "arch=${arch}" \
-    --build-arg "arch_qemu=$arch_qemu" --build-arg "ncp_ver=${version?}"
+    --build-arg "arch_qemu=$arch_qemu" --build-arg "ncp_ver=${version#docker-}"
 
-  docker tag "ownyourbits/${target}-${suffix}:latest" "ownyourbits/${target}-${suffix}:${version}"
+  docker tag "ownyourbits/${target}-${suffix}:latest" "ownyourbits/${target}-${suffix}:${version#docker-}"
 }
 
 get_arch_args() {

build/docker/Dockerfile

@@ -213,7 +213,7 @@ rm -f /var/log/alternatives.log /var/log/apt/*; \
 rm /var/cache/debconf/*-old; \
 
 # set version
-echo "${ncp_ver}" > /usr/local/etc/ncp-version
+echo "${ncp_ver#docker-}" > /usr/local/etc/ncp-version
 
 COPY build/docker/nextcloudpi/000ncp /etc/services-enabled.d/
 

changelog.md

@@ -1,5 +1,15 @@
 # NextcloudPi Changelog
 
+## [v1.52.0](https://github.com/nextcloud/nextcloudpi/tree/v1.51.3) (2023-05-01) Add support for Nextcloud 26.0.1
+
+### Changes
+
+- Add support for NC 26.0.1
+
+### Fixes
+
+- Fix possible folder name collision in ncp-restore
+
 ## [v1.51.3](https://github.com/nextcloud/nextcloudpi/tree/v1.51.3) (2023-04-26) Add support for Nextcloud 25.0.6
 
 ### Changes

etc/ncp-config.d/nc-nextcloud.cfg

@@ -9,7 +9,7 @@
     {
       "id": "VER",
       "name": "Version",
-      "value": "25.0.6"
+      "value": "26.0.1"
     },
     {
       "id": "MAXFILESIZE",

etc/ncp.cfg

@@ -1,5 +1,5 @@
 {
-	"nextcloud_version": "25.0.6",
+	"nextcloud_version": "26.0.1",
 	"php_version": "8.1",
 	"release": "bullseye"
 }

ncp-app/appinfo/info.xml

@@ -12,7 +12,7 @@
     <category>tools</category>
     <bugs>https://github.com/nextcloud/nextcloudpi/issues</bugs>
     <dependencies>
-        <nextcloud min-version="14" max-version="25"/>
+        <nextcloud min-version="14" max-version="26"/>
     </dependencies>
     <navigations>
         <navigation>

ncp-previewgenerator/ncp-previewgenerator-nc21/appinfo/info.xml

@@ -25,7 +25,7 @@ The first time you install this app, before using a cron job, you properly want
 	</types>
 	<dependencies>
 		<php min-version="7.2"/>
-		<nextcloud min-version="20" max-version="25" />
+		<nextcloud min-version="20" max-version="26" />
 	</dependencies>
 
 	<commands>