From 26a7c88ddf78bbbca1c303fc4d60bd2780c611de Mon Sep 17 00:00:00 2001 From: Einer von Vielen Date: Sat, 5 May 2018 20:46:41 +0200 Subject: Install imagemagick --- .homeinstall/hubzilla-setup.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to '.homeinstall/hubzilla-setup.sh') diff --git a/.homeinstall/hubzilla-setup.sh b/.homeinstall/hubzilla-setup.sh index 3ad9aa37f..a38e36b73 100755 --- a/.homeinstall/hubzilla-setup.sh +++ b/.homeinstall/hubzilla-setup.sh @@ -136,17 +136,17 @@ function check_config { # backup is important and should be checked if [ -n "$backup_device_name" ] then - device_mounted=0 + if [ ! -d "$backup_mount_point" ] + then + mkdir "$backup_mount_point" + fi + device_mounted=0 if fdisk -l | grep -i "$backup_device_name.*linux" then print_info "ok - filesystem of external device is linux" if [ -n "$backup_device_pass" ] then echo "$backup_device_pass" | cryptsetup luksOpen $backup_device_name cryptobackup - if [ ! -d /media/hubzilla_backup ] - then - mkdir /media/hubzilla_backup - fi if mount /dev/mapper/cryptobackup /media/hubzilla_backup then device_mounted=1 @@ -246,6 +246,11 @@ function install_apache { nocheck_install "apache2 apache2-utils" } +function install_imagemagick { + print_info "installing imagemagick..." + nocheck_install "imagemagick" +} + function install_curl { print_info "installing curl..." nocheck_install "curl" @@ -801,6 +806,7 @@ update_upgrade install_curl install_sendmail install_apache +install_imagemagick install_php install_mysql install_phpmyadmin -- cgit v1.2.3 From 10491294d8ed78af565aef690d80c99e9adb4d0b Mon Sep 17 00:00:00 2001 From: gia vec Date: Wed, 13 Jun 2018 03:53:55 +0200 Subject: Update hubzilla-setup.sh (cherry picked from commit 95f2eb68ca38976b7ca9d3f5c2d89c923d5ef4b5) --- .homeinstall/hubzilla-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.homeinstall/hubzilla-setup.sh') diff --git a/.homeinstall/hubzilla-setup.sh b/.homeinstall/hubzilla-setup.sh index a38e36b73..ff101086c 100755 --- a/.homeinstall/hubzilla-setup.sh +++ b/.homeinstall/hubzilla-setup.sh @@ -572,7 +572,7 @@ function check_https { function install_hubzilla { print_info "installing hubzilla addons..." cd /var/www/html/ - util/add_addon_repo https://github.com/redmatrix/hubzilla-addons.git hzaddons + util/add_addon_repo https://framagit.org/hubzilla/addons.git hzaddons mkdir -p "store/[data]/smarty3" chmod -R 777 store touch .htconfig.php -- cgit v1.2.3