b55e62e4a6
- Add dependency on gconf2 - Bump PORTREVISION Reported by: Mats Andreassen <matsa@pvv.ntnu.no> (via private e-mail)
56 lines
2.4 KiB
Plaintext
56 lines
2.4 KiB
Plaintext
--- platform9/lib/nbexec.orig 2008-12-15 14:20:13.000000000 +0100
|
|
+++ platform9/lib/nbexec 2008-12-15 14:29:44.000000000 +0100
|
|
@@ -330,7 +330,7 @@
|
|
}
|
|
|
|
detect_gnome_proxy () {
|
|
- gconftool=/usr/bin/gconftool-2
|
|
+ gconftool=%%GCONFTOOL2%%
|
|
if [ -x $gconftool ] ; then
|
|
proxy_mode=`$gconftool --get /system/proxy/mode 2>/dev/null`
|
|
if [ "$proxy_mode" = "manual" ] ; then
|
|
@@ -362,18 +362,18 @@
|
|
detect_kde_proxy () {
|
|
kioslaverc="${HOME}/.kde/share/config/kioslaverc"
|
|
if [ -f $kioslaverc ] ; then
|
|
- if /bin/grep -q 'ProxyType=1' "$kioslaverc" ; then
|
|
- http_proxy_tmp=`/bin/grep 'httpProxy=http://' "$kioslaverc"`
|
|
+ if %%GREP%% -q 'ProxyType=1' "$kioslaverc" ; then
|
|
+ http_proxy_tmp=`%%GREP%% 'httpProxy=http://' "$kioslaverc"`
|
|
if [ $? ] ; then
|
|
- http_proxy_tmp=`echo $http_proxy_tmp | /bin/sed 's/httpProxy=http:\/\///'`
|
|
+ http_proxy_tmp=`echo $http_proxy_tmp | %%SED%% 's/httpProxy=http:\/\///'`
|
|
return 0
|
|
fi
|
|
- http_non_proxy_hosts=`/bin/grep 'NoProxyFor=' "$kioslaverc"`
|
|
+ http_non_proxy_hosts=`%%GREP%% 'NoProxyFor=' "$kioslaverc"`
|
|
if [ $? ] ; then
|
|
- http_non_proxy_hosts=`echo $http_non_proxy_hosts | /bin/sed 's/NoProxyFor=//'`
|
|
+ http_non_proxy_hosts=`echo $http_non_proxy_hosts | %%SED%% 's/NoProxyFor=//'`
|
|
fi
|
|
else
|
|
- if /bin/grep -q 'ProxyType=0' "$kioslaverc" ; then
|
|
+ if %%GREP%% -q 'ProxyType=0' "$kioslaverc" ; then
|
|
detect_system_proxy
|
|
if [ -z "$http_proxy_tmp" ]; then
|
|
http_proxy_tmp="DIRECT"
|
|
@@ -397,14 +397,14 @@
|
|
close
|
|
EOF
|
|
|
|
- if /usr/bin/grep -q "ProxyAuto.*: *1" ${scutil_out} >/dev/null ; then
|
|
+ if %%GREP%% -q "ProxyAuto.*: *1" ${scutil_out} >/dev/null ; then
|
|
rm ${scutil_out}
|
|
return 1
|
|
fi
|
|
|
|
- if /usr/bin/grep -q "HTTPEnable *: *1" ${scutil_out} ; then
|
|
- http_proxy_host=`/usr/bin/grep HTTPProxy ${scutil_out} | /usr/bin/awk '{print $3}'`
|
|
- http_proxy_port=`/usr/bin/grep HTTPPort ${scutil_out} | /usr/bin/awk '{print $3} '`
|
|
+ if %%GREP%% -q "HTTPEnable *: *1" ${scutil_out} ; then
|
|
+ http_proxy_host=`%%GREP%% HTTPProxy ${scutil_out} | %%AWK%% '{print $3}'`
|
|
+ http_proxy_port=`%%GREP%% HTTPPort ${scutil_out} | %%AWK%% '{print $3} '`
|
|
http_proxy_tmp=$http_proxy_host:$http_proxy_port
|
|
rm ${scutil_out}
|
|
return 0
|