summaryrefslogtreecommitdiff
authorzecke <zecke>2004-10-10 16:23:46 (UTC)
committer zecke <zecke>2004-10-10 16:23:46 (UTC)
commit96e6046ac26725836d38832a6e3a491351deeb53 (patch) (unidiff)
treee3c84c1757403426faafbadfb7130c0d480a9ba2
parent44f716e0f0aaf35869558a805e0fa7791996897a (diff)
downloadopie-96e6046ac26725836d38832a6e3a491351deeb53.zip
opie-96e6046ac26725836d38832a6e3a491351deeb53.tar.gz
opie-96e6046ac26725836d38832a6e3a491351deeb53.tar.bz2
-Stop bashism
-Do not use /usr/bin/env but the full qualified path to the executable
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--share/opie-console/sl6000_embedix_kill_0_1.sh14
-rw-r--r--share/opie-console/sl6000_embedix_restart_0_1.sh14
2 files changed, 14 insertions, 14 deletions
diff --git a/share/opie-console/sl6000_embedix_kill_0_1.sh b/share/opie-console/sl6000_embedix_kill_0_1.sh
index 369c23e..434d7fb 100644
--- a/share/opie-console/sl6000_embedix_kill_0_1.sh
+++ b/share/opie-console/sl6000_embedix_kill_0_1.sh
@@ -1,29 +1,29 @@
1#!/bin/bash 1#!/bin/sh
2 2
3# Use egrep to fid out if we need to comment /etc/sync/serialctl 3# Use egrep to fid out if we need to comment /etc/sync/serialctl
4# from the inittab 4# from the inittab
5/usr/bin/env egrep -q '^pd:[0-9]:respawn:/etc/sync/serialctl' /etc/inittab 2>/dev/null 5/bin/egrep -q '^pd:[0-9]:respawn:/etc/sync/serialctl' /etc/inittab 2>/dev/null
6 6
7# If egrep did not find an enabled /etc/sync/serialctl in /etc/inittab, 7# If egrep did not find an enabled /etc/sync/serialctl in /etc/inittab,
8# exit now (nothing to do) 8# exit now (nothing to do)
9if [ $? -ne 0 ]; then 9if [ $? -ne 0 ]; then
10 exit 0 10 exit 0
11fi 11fi
12 12
13# This "cp -af" is to get the perms correct on /etc/inittab.tmp 13# This "cp -af" is to get the perms correct on /etc/inittab.tmp
14/usr/bin/env cp -af /etc/inittab /etc/inittab.tmp 14/bin/cp -af /etc/inittab /etc/inittab.tmp
15 15
16# This sed comments out the "etc/sync/serialctl" line 16# This sed comments out the "etc/sync/serialctl" line
17/usr/bin/env sed 's%^\(pd:[0-9]:respawn:/etc/sync/serialctl\)%#\1%' /etc/inittab > /etc/inittab.tmp 17/bin/sed 's%^\(pd:[0-9]:respawn:/etc/sync/serialctl\)%#\1%' /etc/inittab > /etc/inittab.tmp
18 18
19# We have not yet modified /etc/inittab, so to stay on the safe side 19# We have not yet modified /etc/inittab, so to stay on the safe side
20# only modify it if the sed succeeded at what we asked it to do. 20# only modify it if the sed succeeded at what we asked it to do.
21if [ $? -eq 0 ]; then 21if [ $? -eq 0 ]; then
22 # This "cp -af" puts the new /etc/inittab into place 22 # This "cp -af" puts the new /etc/inittab into place
23 /usr/bin/env cp -af /etc/inittab.tmp /etc/inittab 23 /bin/cp -af /etc/inittab.tmp /etc/inittab
24 # Unlink the tmp file 24 # Unlink the tmp file
25 rm /etc/inittab.tmp 25 /bin/rm /etc/inittab.tmp
26 # HUP init 26 # HUP init
27 /usr/bin/env kill -HUP 1 27 /bin/kill -HUP 1
28fi 28fi
29 29
diff --git a/share/opie-console/sl6000_embedix_restart_0_1.sh b/share/opie-console/sl6000_embedix_restart_0_1.sh
index 4ce0e7e..a0a79b5 100644
--- a/share/opie-console/sl6000_embedix_restart_0_1.sh
+++ b/share/opie-console/sl6000_embedix_restart_0_1.sh
@@ -1,29 +1,29 @@
1#!/bin/bash 1#!/bin/sh
2 2
3# Use egrep to fid out if we need to comment /etc/sync/serialctl 3# Use egrep to fid out if we need to comment /etc/sync/serialctl
4# from the inittab 4# from the inittab
5/usr/bin/env egrep -q '^#pd:[0-9]:respawn:/etc/sync/serialctl' /etc/inittab 2>/dev/null 5/bin/egrep -q '^#pd:[0-9]:respawn:/etc/sync/serialctl' /etc/inittab 2>/dev/null
6 6
7# If egrep did not find an enabled /etc/sync/serialctl in /etc/inittab, 7# If egrep did not find an enabled /etc/sync/serialctl in /etc/inittab,
8# exit now (nothing to do) 8# exit now (nothing to do)
9if [ $? -ne 0 ]; then 9if [ $? -ne 0 ]; then
10 exit 0 10 exit 0
11fi 11fi
12 12
13# This "cp -af" is to get the perms correct on /etc/inittab.tmp 13# This "cp -af" is to get the perms correct on /etc/inittab.tmp
14/usr/bin/env cp -af /etc/inittab /etc/inittab.tmp 14/bin/cp -af /etc/inittab /etc/inittab.tmp
15 15
16# This sed comments out the "etc/sync/serialctl" line 16# This sed comments out the "etc/sync/serialctl" line
17/usr/bin/env sed 's%^#\(pd:[0-9]:respawn:/etc/sync/serialctl\)%\1%' /etc/inittab > /etc/inittab.tmp 17/bin/sed 's%^#\(pd:[0-9]:respawn:/etc/sync/serialctl\)%\1%' /etc/inittab > /etc/inittab.tmp
18 18
19# We have not yet modified /etc/inittab, so to stay on the safe side 19# We have not yet modified /etc/inittab, so to stay on the safe side
20# only modify it if the sed succeeded at what we asked it to do. 20# only modify it if the sed succeeded at what we asked it to do.
21if [ $? -eq 0 ]; then 21if [ $? -eq 0 ]; then
22 # This "cp -af" puts the new /etc/inittab into place 22 # This "cp -af" puts the new /etc/inittab into place
23 /usr/bin/env cp -af /etc/inittab.tmp /etc/inittab 23 /bin/cp -af /etc/inittab.tmp /etc/inittab
24 # Unlink the tmp file 24 # Unlink the tmp file
25 rm /etc/inittab.tmp 25 /bin/rm /etc/inittab.tmp
26 # HUP init 26 # HUP init
27 /usr/bin/env kill -HUP 1 27 /bin/kill -HUP 1
28fi 28fi
29 29