Fix permission change of existing directories at core updates.

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

diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh
index ccd58dbda23b816273b4dec69bd387048e8f32cc..e4e3d5bc09bbe7f7b076d8c5b494609ddd0a76e9 100644 (file)
--- a/src/pakfire/lib/functions.sh
+++ b/src/pakfire/lib/functions.sh
@@ -24,14 +24,14 @@
 
 extract_files() {
        echo "Extracting files..."
-       tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C /
+       tar xvf /opt/pakfire/tmp/files --no-overwrite-dir --preserve --numeric-owner -C /
        echo "...Finished."
 }
 
 remove_files() {
        echo "Removing files..."
-       for i in $(cat /opt/pakfire/tmp/ROOTFILES); do
-               rm -rfv ${i}
+       for i in $(cat /opt/pakfire/db/rootfiles/${NAME}); do
+           rm -rfv /${i}
        done
        echo "...Finished."
 }
@@ -75,12 +75,16 @@ start_service() {
                                ;;
                        *)
                                break
-                               ;;                      
+                               ;;
                esac
        done
-               
+
        if [ -e "/etc/init.d/${1}" ]; then
-        (sleep ${DELAY} && /etc/init.d/${1} start) ${BACKGROUND}
+           if [ -n "${BACKGROUND}" ]; then
+                               (sleep ${DELAY} && /etc/init.d/${1} start) &
+                       else
+                               sleep ${DELAY} && /etc/init.d/${1} start
+                       fi
        fi
 }
 
@@ -89,3 +93,10 @@ stop_service() {
                /etc/init.d/${1} stop
        fi
 }
+
+rebuild_langcache() {
+       echo "Rebuilding language cache..."
+       perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+       echo "...Finished."
+}
+