45 lines
1.1 KiB
Plaintext
45 lines
1.1 KiB
Plaintext
$OpenBSD: patch-scripts_util_ss_vncviewer,v 1.2 2017/02/26 20:11:53 sthen Exp $
|
|
--- scripts/util/ss_vncviewer.orig Mon Apr 11 23:24:15 2011
|
|
+++ scripts/util/ss_vncviewer Sun Feb 26 20:10:35 2017
|
|
@@ -150,37 +150,15 @@ if [ "X$SS_DEBUG" != "X" -a "X$SS_DEBUG" != "X0" ]; th
|
|
set -xv
|
|
fi
|
|
|
|
-PATH=$PATH:/usr/sbin:/usr/local/sbin:/dist/sbin; export PATH
|
|
+PATH=$PATH:/usr/sbin:/usr/local/sbin; export PATH
|
|
|
|
localhost="localhost"
|
|
if uname | grep Darwin >/dev/null; then
|
|
localhost="127.0.0.1"
|
|
fi
|
|
|
|
-# work out which stunnel to use (debian installs as stunnel4)
|
|
-stunnel_set_here=""
|
|
-if [ "X$STUNNEL" = "X" ]; then
|
|
- check_stunnel=1
|
|
- if [ "X$SSVNC_BASEDIRNAME" != "X" ]; then
|
|
- if [ -x "$SSVNC_BASEDIRNAME/stunnel" ]; then
|
|
- type stunnel > /dev/null 2>&1
|
|
- if [ $? = 0 ]; then
|
|
- # found ours
|
|
- STUNNEL=stunnel
|
|
- check_stunnel=0
|
|
- fi
|
|
- fi
|
|
- fi
|
|
- if [ "X$check_stunnel" = "X1" ]; then
|
|
- type stunnel4 > /dev/null 2>&1
|
|
- if [ $? = 0 ]; then
|
|
- STUNNEL=stunnel4
|
|
- else
|
|
- STUNNEL=stunnel
|
|
- fi
|
|
- fi
|
|
- stunnel_set_here=1
|
|
-fi
|
|
+STUNNEL=/usr/local/sbin/stunnel
|
|
+stunnel_set_here=1
|
|
|
|
help() {
|
|
tail -n +2 "$0" | sed -e '/^$/ q'
|