diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-07-25 10:19:19 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-07-25 10:19:19 +0200 |
| commit | 1b1d11dcf1091158232e98abad966d4900e2ccc9 (patch) | |
| tree | 380d5e04c73391089bf3d658ea4b27eecffa4916 /.homeinstall/hubzilla-setup.sh | |
| parent | b655d04b3474893ee3dea99b77f2e7dd764729a0 (diff) | |
| parent | 35200e5f1b10cdd18af8f0ea646996e438b97011 (diff) | |
| download | volse-hubzilla-1b1d11dcf1091158232e98abad966d4900e2ccc9.tar.gz volse-hubzilla-1b1d11dcf1091158232e98abad966d4900e2ccc9.tar.bz2 volse-hubzilla-1b1d11dcf1091158232e98abad966d4900e2ccc9.zip | |
Merge branch '3.6RC'
Diffstat (limited to '.homeinstall/hubzilla-setup.sh')
| -rwxr-xr-x | .homeinstall/hubzilla-setup.sh | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/.homeinstall/hubzilla-setup.sh b/.homeinstall/hubzilla-setup.sh index 3ad9aa37f..ff101086c 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" @@ -567,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 @@ -801,6 +806,7 @@ update_upgrade install_curl install_sendmail install_apache +install_imagemagick install_php install_mysql install_phpmyadmin |