It might be that we just don't want a proxy. Allow a `none' setting for
these cases. Set the ftp-proxy correctly too.
export PERL_READLINE_NOWARN=yes
[ -z "$NNTPSERVER" ] && export NNTPSERVER=`mdw-conf nntp-server`
export PERL_READLINE_NOWARN=yes
[ -z "$NNTPSERVER" ] && export NNTPSERVER=`mdw-conf nntp-server`
-[ -z "$http_proxy" ] && export http_proxy=http://`mdw-conf http-proxy`/
-[ -z "$ftp_proxy" ] && export ftp_proxy=$http_proxy
+
+http=`mdw-conf http-proxy none`
+case "${http_proxy-none},$http" in
+ *,none) ;;
+ none,*) export http_proxy=$http ;;
+esac
+ftp=`mdw-conf ftp-proxy none`
+case "${ftp_proxy-none},$ftp,${http_proxy-none}" in
+ *,none,none) ;;
+ none,none,*) export ftp_proxy=$http_proxy ;;
+ none,*,*) export ftp_proxy=$ftp ;;
+esac
export XUSERFILESEARCHPATH="$HOME/.Xapps/%N:/usr/lib/X11/%T/%N%S"
export XUSERFILESEARCHPATH="$HOME/.Xapps/%N:/usr/lib/X11/%T/%N%S"