Changeset acbc1aa in freewrt

Timestamp:

Mar 16, 2007, 10:39:25 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

4a86091

Parents:

130b7a6

Message:

portability fix

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2173 afb5a338-a214-0410-bd46-81f09a774fd1

Files:

• mk/build.mk (modified) (1 diff)
• scripts/restore-defaultconf.sh (modified) (2 diffs, 1 prop)

mk/build.mk

@@ -134 +134 @@
 allmodconfig: $(CONFIG)/conf
         @$(CONFIG)/conf -m $(CONFIG_CONFIG_IN)
-        scripts/restore-defaultconf.sh $(RESTORE_PATTERNS)
+        ${BASH} scripts/restore-defaultconf.sh $(RESTORE_PATTERNS)
 
 snapshotconfig: $(CONFIG)/conf
         @$(CONFIG)/conf -m Config.in.snapshot
-        scripts/restore-defaultconf.sh $(RESTORE_PATTERNS)
+        ${BASH} scripts/restore-defaultconf.sh $(RESTORE_PATTERNS)
 
 tools/install-lbin:

scripts/restore-defaultconf.sh

@@ -1 @@
-#!/bin/bash
-#
+# $FreeWRT$
+
 # restore patterns given in $@
 # in .config using defaults found
@@ -6 +6 @@
 
 restore() { # (pattern)
-        sed -i "s/^.*$1.*$//g" .config || return 1
-        grep $1 Config.default >> .config
+        printf ',g/%s/d\nwq\n' "$1" | ed -s .config || return 1
+        grep "$1" Config.default >> .config
         return $?
 }
 
-for pattern in $@ ; do
-        restore $pattern || echo "WARNING: internal restoring of defaults by pattern $pattern failed!"
+for pattern in "$@" ; do
+        restore "$pattern" || echo "WARNING: internal restoring of defaults by pattern $pattern failed!"
 done