From 9ce622b5bdb82c7bd28ec0f95132629097e26db1 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 6 Jul 2016 09:31:13 +0100 Subject: [PATCH] Project name --- src/freedombone-adduser | 4 ++-- src/freedombone-app-blog | 2 +- src/freedombone-app-gnusocial | 2 +- src/freedombone-app-hubzilla | 2 +- src/freedombone-app-syncthing | 4 ++-- src/freedombone-base-email | 2 +- src/freedombone-controlpanel | 2 +- src/freedombone-controlpanel-user | 2 +- src/freedombone-image-customise | 2 +- src/freedombone-zram | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/freedombone-adduser b/src/freedombone-adduser index 925bd8ce..6f18d1f7 100755 --- a/src/freedombone-adduser +++ b/src/freedombone-adduser @@ -257,7 +257,7 @@ if grep -q "Blog domain" $COMPLETION_FILE; then userdel -r $MY_USERNAME exit 9 fi - NEW_USER_PASSWORD_HASH=$(freedombone-sec --bloghash "$NEW_USER_PASSWORD") + NEW_USER_PASSWORD_HASH=$(${PROJECT_NAME}-sec --bloghash "$NEW_USER_PASSWORD") if [ ${#NEW_USER_PASSWORD_HASH} -lt 8 ]; then echo $'Blog admin password could not be hashed' exit 783528 @@ -293,7 +293,7 @@ if grep -q "install_gnusocial" $COMPLETION_FILE; then if [ -d /var/www/$MICROBLOG_DOMAIN_NAME ]; then cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs php scripts/registeruser.php -n $MY_USERNAME -w "$NEW_USER_PASSWORD" -e "$MY_USERNAME@$HOSTNAME" - freedombone-addemail -u $MY_USERNAME -e "noreply@$MICROBLOG_DOMAIN_NAME" -g gnusocial --public no + ${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$MICROBLOG_DOMAIN_NAME" -g gnusocial --public no echo $'Created GNU Social user' else echo $"Unable to find GNU Social installation at /var/www/$MICROBLOG_DOMAIN_NAME/htdocs" diff --git a/src/freedombone-app-blog b/src/freedombone-app-blog index 30819bf0..359579be 100755 --- a/src/freedombone-app-blog +++ b/src/freedombone-app-blog @@ -324,7 +324,7 @@ function install_blog { fi # create a user - FULLBLOG_ADMIN_PASSWORD_HASH=$(freedombone-sec --bloghash "$FULLBLOG_ADMIN_PASSWORD") + FULLBLOG_ADMIN_PASSWORD_HASH=$(${PROJECT_NAME}-sec --bloghash "$FULLBLOG_ADMIN_PASSWORD") if [ ${#FULLBLOG_ADMIN_PASSWORD_HASH} -lt 8 ]; then echo $'Blog admin password could not be hashed' exit 625728 diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial index 955f9610..ff617ebe 100755 --- a/src/freedombone-app-gnusocial +++ b/src/freedombone-app-gnusocial @@ -337,7 +337,7 @@ function install_gnusocial_main { systemctl restart php5-fpm systemctl restart nginx - freedombone-addemail -u $MY_USERNAME -e "noreply@$MICROBLOG_DOMAIN_NAME" -g gnusocial --public no + ${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$MICROBLOG_DOMAIN_NAME" -g gnusocial --public no # some post-install instructions for the user if ! grep -q $"Microblog administrator" /home/$MY_USERNAME/README; then diff --git a/src/freedombone-app-hubzilla b/src/freedombone-app-hubzilla index 12f49e1a..dc9ab5c3 100755 --- a/src/freedombone-app-hubzilla +++ b/src/freedombone-app-hubzilla @@ -402,7 +402,7 @@ function install_hubzilla { systemctl restart nginx systemctl restart cron - freedombone-addemail -u $MY_USERNAME -e "noreply@$HUBZILLA_DOMAIN_NAME" -g hubzilla --public no + ${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$HUBZILLA_DOMAIN_NAME" -g hubzilla --public no echo "Hubzilla domain:${HUBZILLA_DOMAIN_NAME}" >> $COMPLETION_FILE echo 'install_hubzilla' >> $COMPLETION_FILE diff --git a/src/freedombone-app-syncthing b/src/freedombone-app-syncthing index 1d8e0415..c66d634a 100755 --- a/src/freedombone-app-syncthing +++ b/src/freedombone-app-syncthing @@ -54,7 +54,7 @@ function remove_syncthing { systemctl disable syncthing apt-get -y remove --purge syncthing rm /etc/systemd/system/syncthing.service - sed -i '/freedombone-syncthing/d' /etc/crontab + sed -i "/${PROJECT_NAME}-syncthing/d" /etc/crontab sed -i '/install_syncthing/d' $COMPLETION_FILE sed -i '/configure_firewall_for_syncthing/d' $COMPLETION_FILE systemctl restart cron @@ -111,7 +111,7 @@ function install_syncthing { systemctl start syncthing function_check cron_add_mins - cron_add_mins 1 '/usr/local/bin/freedombone-syncthing > /dev/null' + cron_add_mins 1 "/usr/local/bin/${PROJECT_NAME}-syncthing > /dev/null" function_check configure_firewall_for_syncthing configure_firewall_for_syncthing diff --git a/src/freedombone-base-email b/src/freedombone-base-email index 8a54bf2a..06a41552 100755 --- a/src/freedombone-base-email +++ b/src/freedombone-base-email @@ -979,7 +979,7 @@ function handle_admin_emails { return fi - freedombone-addemail -u $MY_USERNAME -e "root@$DEFAULT_DOMAIN_NAME" -g admin --public no + ${PROJECT_NAME}-addemail -u $MY_USERNAME -e "root@$DEFAULT_DOMAIN_NAME" -g admin --public no } function spam_filtering { diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel index 3689556b..06264b35 100755 --- a/src/freedombone-controlpanel +++ b/src/freedombone-controlpanel @@ -2120,7 +2120,7 @@ function menu_top_level { if [[ $USER != 'root' ]]; then # show the user version of the control panel - freedombone-controlpanel-user + ${PROJECT_NAME}-controlpanel-user exit 0 fi diff --git a/src/freedombone-controlpanel-user b/src/freedombone-controlpanel-user index 5b2c5db9..91b9f745 100755 --- a/src/freedombone-controlpanel-user +++ b/src/freedombone-controlpanel-user @@ -887,7 +887,7 @@ function menu_admin { clear exit 0 fi - sudo freedombone-controlpanel + sudo ${PROJECT_NAME}-controlpanel } function sign_keys { diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index 3a8aec87..42c9a2be 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -1186,7 +1186,7 @@ function install_syncthing { chroot "$rootdir" systemctl daemon-reload if ! grep -q "syncthing" $rootdir/etc/crontab; then - chroot "$rootdir" echo "*/1 * * * * root /usr/local/bin/freedombone-syncthing > /dev/null" >> /etc/crontab + chroot "$rootdir" echo "*/1 * * * * root /usr/local/bin/${PROJECT_NAME}-syncthing > /dev/null" >> /etc/crontab chroot "$rootdir" systemctl restart cron fi diff --git a/src/freedombone-zram b/src/freedombone-zram index ffbbb0be..c4da621d 100755 --- a/src/freedombone-zram +++ b/src/freedombone-zram @@ -45,7 +45,7 @@ function zram_daemon { echo 'User=zram' >> $DAEMON_FILENAME echo 'Group=zram' >> $DAEMON_FILENAME echo 'WorkingDirectory=' >> $DAEMON_FILENAME - echo "ExecStart=freedombone-zram on" >> $DAEMON_FILENAME + echo "ExecStart=${PROJECT_NAME}-zram on" >> $DAEMON_FILENAME echo '' >> $DAEMON_FILENAME echo '[Install]' >> $DAEMON_FILENAME echo 'WantedBy=multi-user.target' >> $DAEMON_FILENAME