extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-25 17:13:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use readlink(1) where appropriate

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-05-23 13:37:26 -07:00
parent 1b00aeb1bc
commit d32ed01cf0
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall-init/shorewall-init.spec
View File

@ -77,8 +77,8 @@ if [ $1 -eq 0 ]; then
/sbin/chkconfig --del shorewall-init /sbin/chkconfig --del shorewall-init
fi fi
[ -f /sbin/ifup-local ] && $(ls -l /sbin/ifup-local) | grep -q /usr/share/shorewall-init && rm -f /sbin/ifup-local [ "$(readdir /sbin/ifup-local)" = /usr/share/shorewall-init ] && rm -f /sbin/ifup-local
[ -f /sbin/ifdown-local ] && $(ls -l /sbin/ifdown-local) | grep -q /usr/share/shorewall-init && rm -f /sbin/ifdown-local [ "$(readdir /sbin/ifdown-local)" = /usr/share/shorewall-init ] && rm -f /sbin/ifdown-local
rm -f /etc/sysconfig/network/if-up.d/shorewall rm -f /etc/sysconfig/network/if-up.d/shorewall
rm -f /etc/sysconfig/network/if-down.d/shorewall rm -f /etc/sysconfig/network/if-down.d/shorewall

4
Shorewall-init/uninstall.sh
View File

@ -76,8 +76,8 @@ if [ -n "$INITSCRIPT" ]; then
remove_file $INITSCRIPT remove_file $INITSCRIPT
fi fi
[ -f /sbin/ifup-local ] && $(ls -l /sbin/ifup-local) | grep -q /usr/share/shorewall-init && remove_file /sbin/ifup-local [ "$(readlink /sbin/ifup-local)" = /usr/share/shorewall-init ] && remove_file /sbin/ifup-local
[ -f /sbin/ifdown-local ] && $(ls -l /sbin/ifdown-local) | grep -q /usr/share/shorewall-init && remove_file /sbin/ifdown-local [ "$(readlink /sbin/ifdown-local)" = /usr/share/shorewall-init ] && remove_file /sbin/ifdown-local
remove_file /etc/default/shorewall-init remove_file /etc/default/shorewall-init
remove_file /etc/sysconfig/shorewall-init remove_file /etc/sysconfig/shorewall-init

2
Shorewall-lite/uninstall.sh
View File

@ -79,7 +79,7 @@ if qt iptables -L shorewall -n && [ ! -f /sbin/shorewall ]; then
fi fi
if [ -L /usr/share/shorewall-lite/init ]; then if [ -L /usr/share/shorewall-lite/init ]; then
FIREWALL=$(ls -l /usr/share/shorewall-lite/init | sed 's/^.*> //') FIREWALL=$(readlink /usr/share/shorewall-lite/init)
else else
FIREWALL=/etc/init.d/shorewall-lite FIREWALL=/etc/init.d/shorewall-lite
fi fi

2
Shorewall/uninstall.sh
View File

@ -79,7 +79,7 @@ if qt iptables -L shorewall -n && [ ! -f /sbin/shorewall-lite ]; then
fi fi
if [ -L /usr/share/shorewall/init ]; then if [ -L /usr/share/shorewall/init ]; then
FIREWALL=$(ls -l /usr/share/shorewall/init | sed 's/^.*> //') FIREWALL=$(readlink /usr/share/shorewall/init)
else else
FIREWALL=/etc/init.d/shorewall FIREWALL=/etc/init.d/shorewall
fi fi

2
Shorewall6-lite/uninstall.sh
View File

@ -67,7 +67,7 @@ if qt ip6tables -L shorewall -n && [ ! -f /sbin/shorewall6 ]; then
fi fi
if [ -L /usr/share/shorewall6-lite/init ]; then if [ -L /usr/share/shorewall6-lite/init ]; then
FIREWALL=$(ls -l /usr/share/shorewall6-lite/init | sed 's/^.*> //') FIREWALL=$(readlink /usr/share/shorewall6-lite/init)
else else
FIREWALL=/etc/init.d/shorewall6-lite FIREWALL=/etc/init.d/shorewall6-lite
fi fi

2
Shorewall6/uninstall.sh
View File

@ -79,7 +79,7 @@ if qt ip6tables -L shorewall6 -n && [ ! -f /sbin/shorewall6-lite ]; then
fi fi
if [ -L /usr/share/shorewall6/init ]; then if [ -L /usr/share/shorewall6/init ]; then
FIREWALL=$(ls -l /usr/share/shorewall6/init | sed 's/^.*> //') FIREWALL=$(readlink /usr/share/shorewall6/init)
else else
FIREWALL=/etc/init.d/shorewall6 FIREWALL=/etc/init.d/shorewall6
fi fi