fix gdb-new, update backup.sh

diff --git a/make/applications.mk b/make/applications.mk
index ac92f1bf6bb1118d2b3f7a3fe3ae403b37066931..78f09a4e5c0e4e8a6c42e5ed1ca56a1f0912d4a1 100755 (executable)
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -290,7 +290,7 @@ $(D)/gdb: $(ARCHIVE)/gdb-7.0.tar.bz2 | $(TARGETPREFIX)
 #  gdb-new built for target or local-PC
 $(D)/gdb-new: $(ARCHIVE)/gdb-7.3.1.tar.bz2 | $(TARGETPREFIX)
        $(UNTAR)/gdb-7.3.1.tar.bz2
-       pushd $(BUILD_TMP)/gdb-7.2 && \
+       pushd $(BUILD_TMP)/gdb-7.3.1 && \
                $(BUILDENV) \
                ./configure \
                        --nfp --disable-werror \

diff --git a/skel-root/bin/backup.sh b/skel-root/bin/backup.sh
index c9d8f4f9eb787caf2cb267ed2f7b41843eb3bea2..2ab6bcf7e2df25c7b6ba6fb55a230994e97fdb57 100755 (executable)
--- a/skel-root/bin/backup.sh
+++ b/skel-root/bin/backup.sh
@@ -1,5 +1,27 @@
 #!/bin/sh
-DATE=`date +%Y-%m-%d-%H:%M:%S`
+
+DATE=$(date +%Y-%m-%d_%H-%M-%S)
+USRF="/var/tuxbox/config/tobackup.conf"
+
+if [ -e "${USRF}" ]; then
+# read user-files from $USRF
+       TOBACKUP="${USRF}"
+       while read i
+               do [ "${i:0:1}" = "#" ] || TOBACKUP="$TOBACKUP ${i%%#*}"
+               done < $USRF
+
+else
+       TOBACKUP="/var/tuxbox/config/"
+fi
+
+# check existence
+RES=""
+for i in $TOBACKUP
+       do [ -e "$i" ] && RES="$RES $i"
+       done
+
+TOBACKUP=$(echo $RES)
+
 echo Backup to $1/settings_$DATE.tar
-cd /
-tar cf $1/settings_$DATE.tar /var/tuxbox/config/
+
+tar -cf $1/settings_$DATE.tar $TOBACKUP 2>&1 >/dev/null