Merge branch 'devel'

martinwilco · Jul 30, 2023 · 27fa012 · 27fa012
2 parents 2ed68b5 + 04cef2e
commit 27fa012
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/bin/ncp-check-version b/bin/ncp-check-version
@@ -6,7 +6,7 @@ TMPDIR="$( mktemp -d /tmp/ncp-check.XXXXXX || ( echo "Failed to create temp dir.
 trap "rm -rf \"${TMPDIR}\"; exit 0" 0 1 2 3 15
 
 BRANCH="master"
-is_docker && BRANCH="docker-stable"
+{ [[ -f /.dockerenv ]] || [[ -f /.docker-image ]] || [[ "$DOCKERBUILD" == 1 ]]; } && BRANCH="docker-stable"
 
 git clone -b "$BRANCH" --depth 20 -q --bare https://github.com/nextcloud/nextcloudpi.git "$TMPDIR" || {
   echo "The git clone command failed: No connectivity to https://github.com ?" >&2

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,11 @@
 # NextcloudPi Changelog
 
+## [v1.52.4](https://github.com/nextcloud/nextcloudpi/tree/v1.52.4) (2023-07-31) Fix error in NCP updater
+
+### Fixes
+
+- Fix missing command in NCP updater
+
 ## [v1.52.3](https://github.com/nextcloud/nextcloudpi/tree/v1.52.3) (2023-07-26) Add support for Nextcloud 27.0.1
 
 ### Changes