Fixing a syntax error in pakfire's functions.sh.

[ipfire-2.x.git] / src / pakfire / lib / functions.sh

diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh
index 0ec8d8f8083dda6c973ad1fe4c18c260cced9f6c..1318cd2c859f46c63d8a2038d574a0b9146af9f0 100644 (file)
--- a/src/pakfire/lib/functions.sh
+++ b/src/pakfire/lib/functions.sh
@@ -36,19 +36,19 @@ remove_files() {
        echo "...Finished."
 }
 
-make_backup(){
-       if [ -e "/var/ipfire/backup/addons/include/${1}" ];then
-       echo "Creating Backup..."
-       /usr/local/bin/backupctrl addonbackup ${1}
-       echo "...Finished."
+make_backup() {
+       if [ -e "/var/ipfire/backup/addons/includes/${1}" ]; then
+               echo "Creating Backup..."
+               /usr/local/bin/backupctrl addonbackup ${1}
+               echo "...Finished."
        fi
 }
 
-restore_backup(){
-       if [ -e "/var/ipfire/backup/addons/backup/${1}" ];then
-       echo "Restoring Backup..."
-       /usr/local/bin/backupctrl restoreaddon ${1}.ipf
-       echo "...Finished."
+restore_backup() {
+       if [ -e "/var/ipfire/backup/addons/backup/${1}.ipf" ]; then
+               echo "Restoring Backup..."
+               /usr/local/bin/backupctrl restoreaddon ${1}.ipf
+               echo "...Finished."
        fi
 }
 
@@ -79,14 +79,17 @@ start_service() {
                esac
        done
                
-               if [ -e "/etc/init.d/${1}" ];then
-                sleep ${DELAY}
-     /etc/init.d/${1} start ${BACKGROUND}
-               fi
+       if [ -e "/etc/init.d/${1}" ]; then
+           if [ -n "${BACKGROUND}" ]; then
+               (sleep ${DELAY} && /etc/init.d/${1} start) &
+           else
+               sleep ${DELAY} && /etc/init.d/${1} start
+           fi
+       fi
 }
 
 stop_service() {
-       if [ -e "/etc/init.d/${1}" ];then
-       /etc/init.d/${1} stop
+       if [ -e "/etc/init.d/${1}" ]; then
+               /etc/init.d/${1} stop
        fi
 }