Upon admin-update do driver-select restore

We do this to remove *.bk files

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index b4f7c54026463756cf6c5b287b9cabc3d248205c..61dc1c8b310f88efa32914a6b11c110cc86ea35b 100755 (executable)
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -221,4 +221,6 @@ if [ -d ./.git ]; then
        cd $DIR
 fi
 
+./scripts/driver-select restore
+
 echo -e "This is compat-release: ${YELLOW}$(cat compat-release)${NORMAL}"

diff --git a/scripts/driver-select b/scripts/driver-select
index 3ada218229f2be9ee6521c61f28d2135df3ddfc2..a7ec5e4c63fdf1cc49459a2315c4c399d170ebf7 100755 (executable)
--- a/scripts/driver-select
+++ b/scripts/driver-select
@@ -142,8 +142,10 @@ if [ ! -f compat-release ]; then
        exit
 fi
 
-# Always backup the top level Makefile
-backup_file Makefile
+# Always backup the top level Makefile, unless restoring
+if [[ "$1" != "restore" ]]; then
+       backup_file Makefile
+fi
 
 case $1 in
        restore)