aboutsummaryrefslogtreecommitdiffstats
path: root/.homeinstall/hubzilla-setup.sh
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-05-14 17:23:19 -0700
committerzotlabs <mike@macgirvin.com>2018-05-14 17:23:19 -0700
commit229d82c4c7ca37c304d1291be7f71ba4b0632f03 (patch)
tree9f0ce27c1e82380987dd9ea317d6bf8e516f7a6b /.homeinstall/hubzilla-setup.sh
parentd9759ba63c8fd70c4da66669389bd19bae3333ff (diff)
parent2d1dbc8f40d0b9fa89b99861fac30d579a400e34 (diff)
downloadvolse-hubzilla-229d82c4c7ca37c304d1291be7f71ba4b0632f03.tar.gz
volse-hubzilla-229d82c4c7ca37c304d1291be7f71ba4b0632f03.tar.bz2
volse-hubzilla-229d82c4c7ca37c304d1291be7f71ba4b0632f03.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to '.homeinstall/hubzilla-setup.sh')
-rwxr-xr-x.homeinstall/hubzilla-setup.sh16
1 files changed, 11 insertions, 5 deletions
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