Kleinere fixes an der Backup Routine

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

diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh
index 1c4e760ea69aa0a2ca7809d7e8fed8d91d18ce60..0ec8d8f8083dda6c973ad1fe4c18c260cced9f6c 100644 (file)
--- a/src/pakfire/lib/functions.sh
+++ b/src/pakfire/lib/functions.sh
@@ -37,28 +37,29 @@ remove_files() {
 }
 
 make_backup(){
-               [ -e "/var/ipfire/backup/addons/include/${1}" ] && \
-               ( echo "Creating Backup..."
-                       /usr/local/bin/backupctrl addonbackup ${1}
-                       echo "...Finished." )
+       if [ -e "/var/ipfire/backup/addons/include/${1}" ];then
+       echo "Creating Backup..."
+       /usr/local/bin/backupctrl addonbackup ${1}
+       echo "...Finished."
+       fi
 }
 
 restore_backup(){
-               [ -e "/var/ipfire/backup/addons/backup/${1}" ] && \
-               ( echo "Restoring Backup..." && \
-                       /usr/local/bin/backupctrl restoreaddon ${1} && \
-                       echo "...Finished." )
+       if [ -e "/var/ipfire/backup/addons/backup/${1}" ];then
+       echo "Restoring Backup..."
+       /usr/local/bin/backupctrl restoreaddon ${1}.ipf
+       echo "...Finished."
+       fi
 }
 
 restart_service() {
-       
-       /etc/init.d/$1 restart
-
+       /etc/init.d/${1} restart
 }
 
 start_service() {
        DELAY=0
        while true
+        do
                case "${1}" in
                        --delay|-d)
                                DELAY=${2}
@@ -76,13 +77,16 @@ start_service() {
                                break
                                ;;                      
                esac
+       done
                
-               [ -e "/etc/init.d/${1}" ] && \
-                (sleep ${DELAY} && /etc/init.d/${1} start ${BACKGROUND})
+               if [ -e "/etc/init.d/${1}" ];then
+                sleep ${DELAY}
+     /etc/init.d/${1} start ${BACKGROUND}
+               fi
 }
 
 stop_service() {
-       
-       [ -e "/etc/init.d/${1}" ] && /etc/init.d/${1} stop
-
+       if [ -e "/etc/init.d/${1}" ];then
+       /etc/init.d/${1} stop
+       fi
 }