run.sh: add reset-only option, set CONFIG_DEFAULT_HOSTNAME=parabola

Signed-off-by: David P <megver83@parabola.nu>

1 files changed, 44 insertions, 22 deletions

diff --git a/run.sh b/run.sh
index 43a8362..e7bd4b5 100755
--- a/run.sh
+++ b/run.sh
@@ -30,7 +30,7 @@ Example: ${0##*/} 4.14 /usr/src/linux-4.14/.config
 To see a list of available versions, look at the files under the $path/versions
 directory.
 
-If the \$RESET environment variable is set, then the sed expresion to reset
+If the \$RESET environment variable is set, then the sed expression to reset
 CONFIG_LOCALVERSION and CONFIG_DEFAULT_HOSTNAME variables of the specified
 config files will be printed and applied. Also CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN
 will be set to "linux-libre.fsfla.org" and CONFIG_LOCALVERSION will be set to
@@ -64,7 +64,9 @@ err() {
 }
 
 check() {
-    if [ ! -f $path/versions/$version ]; then
+    if [[ "$version" = none ]]; then
+        echo "Running with reset expressions only"
+    elif [ ! -f $path/versions/$version ]; then
         err "Version $version not available"
     fi
 
@@ -83,8 +85,8 @@ deblob() {
     for i in $configs; do
         sed -i \
             -e "s|$i=.*|# $i is not set|" \
-            "$reset" \
-            "$firmware" \
+            -e "$reset" \
+            -e "$firmware" \
             $1
         sleep 0.2
     done
@@ -117,19 +119,39 @@ done
 
 main(){
     check
-    local i
-	for i in $@; do
-        load "Modifying $i" &
-        LOG=$(mktemp)
-        deblob $i &> $LOG && \
-            printf "[   OK   ] \n" || \
-            (printf "[ FAILED ] \n"
-            err "Could not modify $i") || \
-            cat $LOG
-        kill $!
-        wait $! 2>/dev/null || true
-        rm $LOG
-    done
+    if [[ "$version" = none ]]; then
+        local i
+        for i in $@; do
+            load "Modifying $i" &
+            LOG=$(mktemp)
+            sed -i \
+                -e "$reset" \
+                -e "$firmware" \
+                $i &> $LOG && \
+                printf "[   OK   ] \n" || \
+                (printf "[ FAILED ] \n"
+                err "Could not modify $i") || \
+                cat $LOG
+            kill $!
+            wait $! 2>/dev/null || true
+            rm $LOG
+        done
+        echo "No deblobbing for configs for now"
+    else
+        local i
+        for i in $@; do
+            load "Modifying $i" &
+            LOG=$(mktemp)
+            deblob $i &> $LOG && \
+                printf "[   OK   ] \n" || \
+                (printf "[ FAILED ] \n"
+                err "Could not modify $i") || \
+                cat $LOG
+            kill $!
+            wait $! 2>/dev/null || true
+            rm $LOG
+        done
+    fi
 }
 
 if [[ $# -lt 1 ]]; then
@@ -137,7 +159,7 @@ if [[ $# -lt 1 ]]; then
 else
     if [[ $RESET = "" ]]; then
         echo "RESET sedexp"
-        export reset="-e s|^CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"\"|;s|^CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME=\"\(none\)\"|;s|^CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN=.*|CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN=\"linux-libre.fsfla.org\"|"
+        export reset="s|^CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"\"|;s|^CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME=\"parabola\"|;s|^CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN=.*|CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN=\"linux-libre.fsfla.org\"|"
         if [[ $version > 4.17 ]]; then
           export reset="$reset;s|# CONFIG_LOCALVERSION_AUTO is not set|CONFIG_LOCALVERSION_AUTO=y|"
         fi
@@ -145,7 +167,7 @@ else
         echo
     elif ! [[ $RESET = "none" ]]; then
         echo "RESET sedexp"
-        export reset="-e s|^CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\""$RESET"\"|;s|^CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME=\"\(none\)\"|;s|^CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN=.*|CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN=\"linux-libre.fsfla.org\"|"
+        export reset="s|^CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\""$RESET"\"|;s|^CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME=\"parabola\"|;s|^CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN=.*|CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN=\"linux-libre.fsfla.org\"|"
         if [[ $version > 4.17 ]]; then
           export reset="$reset;s|# CONFIG_LOCALVERSION_AUTO is not set|CONFIG_LOCALVERSION_AUTO=y|"
         fi
@@ -155,7 +177,7 @@ else
 
     if [[ $FIRMWARE = "" ]]; then
         echo "FIRMWARE sedexp"
-        export firmware="-e /^CONFIG_EXTRA_FIRMWARE_DIR/d;s|^CONFIG_EXTRA_FIRMWARE=.*|CONFIG_EXTRA_FIRMWARE=\"\"|"
+        export firmware="/^CONFIG_EXTRA_FIRMWARE_DIR/d;s|^CONFIG_EXTRA_FIRMWARE=.*|CONFIG_EXTRA_FIRMWARE=\"\"|"
         echo "$firmware"
         echo
     elif ! [[ $FIRMWARE = "none" ]]; then
@@ -167,9 +189,9 @@ else
         echo "FIRMWARE sedexp"
         if ! [[ $extra_firmware = "" ]]; then
             if ! [[ $extra_firmware_dir = "" ]]; then
-                export firmware="-e s|^CONFIG_EXTRA_FIRMWARE=.*|CONFIG_EXTRA_FIRMWARE=\""$extra_firmware"\"|;s|^CONFIG_EXTRA_FIRMWARE_DIR=.*|CONFIG_EXTRA_FIRMWARE_DIR=\""$extra_firmware_dir"\"|"
+                export firmware="s|^CONFIG_EXTRA_FIRMWARE=.*|CONFIG_EXTRA_FIRMWARE=\""$extra_firmware"\"|;s|^CONFIG_EXTRA_FIRMWARE_DIR=.*|CONFIG_EXTRA_FIRMWARE_DIR=\""$extra_firmware_dir"\"|"
             else
-                export firmware="-e s|^CONFIG_EXTRA_FIRMWARE=.*|CONFIG_EXTRA_FIRMWARE=\""$extra_firmware"\"|;/CONFIG_EXTRA_FIRMWARE_DIR/d"
+                export firmware="s|^CONFIG_EXTRA_FIRMWARE=.*|CONFIG_EXTRA_FIRMWARE=\""$extra_firmware"\"|;/CONFIG_EXTRA_FIRMWARE_DIR/d"
             fi
             echo "$firmware"
             echo