build: package php7.2-imagick now available

nextcloud · Nov 11, 2018 · f3666d6 · f3666d6
1 parent b0b18c2
commit f3666d6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,7 +1,9 @@
 
-[v0.66.3](https://github.com/nextcloud/nextcloudpi/commit/a0c4361) (2018-11-11) nc-hdd-test: remove redundancy
+[v0.66.4](https://github.com/nextcloud/nextcloudpi/commit/d1147a2) (2018-11-11) build: package php7.2-imagick now available
 
-[v0.66.2](https://github.com/nextcloud/nextcloudpi/commit/1b25141) (2018-11-06) dont fail removing cronfile
+[v0.66.3](https://github.com/nextcloud/nextcloudpi/commit/d4206f7) (2018-11-11) nc-hdd-test: remove redundancy
+
+[v0.66.2 ](https://github.com/nextcloud/nextcloudpi/commit/1b25141) (2018-11-06) dont fail removing cronfile
 
 [v0.66.1 ](https://github.com/nextcloud/nextcloudpi/commit/089bebb) (2018-11-04) nc-info: speedup
 

diff --git a/etc/ncp-config.d/nc-nextcloud.sh b/etc/ncp-config.d/nc-nextcloud.sh
@@ -43,10 +43,8 @@ install()
   # Optional packets for Nextcloud and Apps
   apt-get update
   $APTINSTALL lbzip2 iputils-ping
-  $APTINSTALL -t $RELEASE php-smbclient                                # for external storage
-  [[ "$(uname -m)" == "x86_64" ]] && {
-    $APTINSTALL -t $RELEASE imagemagick php-imagick php${PHPVER}-exif    # for gallery
-  } # TODO fixme when armhf version is available for php7.2
+  $APTINSTALL -t $RELEASE php-smbclient                                         # for external storage
+  $APTINSTALL -t $RELEASE imagemagick php${PHPVER}-imagick php${PHPVER}-exif    # for gallery
 
 
   # POSTFIX

diff --git a/update.sh b/update.sh
@@ -209,6 +209,7 @@ EOF
   chmod 700 /home/www/ncp-launcher.sh
 
   # Adjust sources
+  export DEBIAN_FRONTEND=noninteractive
   apt-get update
   apt-get install -y --no-install-recommends apt-transport-https gnupg
   echo "deb https://packages.sury.org/php/ stretch main" > /etc/apt/sources.list.d/php.list
@@ -226,6 +227,9 @@ EOF
   # Update btrfs-sync
   wget -q https://raw.githubusercontent.com/nachoparker/btrfs-sync/master/btrfs-sync -O /usr/local/bin/btrfs-sync
 
+  # Update php imagick
+  apt-get install -y --no-install-recommends imagemagick php7.2-imagick php7.2-exif
+
 } # end - only live updates
 
 exit 0