diff options
| author | Silvino Silva <silvino@bk.ru> | 2018-07-18 21:50:28 +0100 |
|---|---|---|
| committer | Silvino Silva <silvino@bk.ru> | 2018-07-18 21:50:28 +0100 |
| commit | ef8c5710e3188580c24f73228860b79cad57290e (patch) | |
| tree | 2e4206fffed0ecdf66b0649919617438fac62214 /tools/scripts | |
| parent | 6eacde73690fab3ce6e34fb99034e8f2917a1164 (diff) | |
| parent | 8e26cc1ca02691e621a82c274e9cfcd90181ccbe (diff) | |
| download | doc-ef8c5710e3188580c24f73228860b79cad57290e.tar.gz | |
Merge branch 'master' into develop
Diffstat (limited to 'tools/scripts')
| -rwxr-xr-x | tools/scripts/replace.sh | 3 | ||||
| -rw-r--r-- | tools/scripts/runvm/profile/crux | 2 | ||||
| -rw-r--r-- | tools/scripts/runvm/runvm.sh | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/tools/scripts/replace.sh b/tools/scripts/replace.sh index e925e7d..8d5d8d9 100755 --- a/tools/scripts/replace.sh +++ b/tools/scripts/replace.sh @@ -5,4 +5,5 @@ folder=$1 oldstring=$2 newstring=$3 -grep -rl $oldstring $folder | xargs sed -i s@$oldstring@$newstring@g +#grep -rl $oldstring $folder | xargs sed -i s@$oldstring@$newstring@g +grep -rl "$oldstring" $folder | xargs sed -i "s@$oldstring@$newstring@g" diff --git a/tools/scripts/runvm/profile/crux b/tools/scripts/runvm/profile/crux index af33e1b..672b80d 100644 --- a/tools/scripts/runvm/profile/crux +++ b/tools/scripts/runvm/profile/crux @@ -2,6 +2,6 @@ mac="54:60:be:ef:5c:64" memory=1024 boot=$2 tap="tap4" -iso=iso/crux-3.3.iso +iso=iso/crux-3.4.iso image=img/c14.qcow2 other="-vga std -display sdl" diff --git a/tools/scripts/runvm/runvm.sh b/tools/scripts/runvm/runvm.sh index 1e56a52..21cd097 100644 --- a/tools/scripts/runvm/runvm.sh +++ b/tools/scripts/runvm/runvm.sh @@ -10,7 +10,7 @@ source profile/$1 #memory=1024 #boot=d #tap="tap1" -#iso=iso/crux-3.3.iso +#iso=iso/crux-3.4.iso #image=img/crux-standard.qcow2 #other="-soundhw hda -vga std -display sdl" |