Annotation of /trunk/nxserver-freenx/nxserver-freenx-0.5.0-nxclient.patch
Parent Directory | Revision Log
Revision 92 -
(hide annotations)
(download)
Thu Jan 4 23:21:10 2007 UTC (17 years, 8 months ago) by niro
File size: 1518 byte(s)
Thu Jan 4 23:21:10 2007 UTC (17 years, 8 months ago) by niro
File size: 1518 byte(s)
new files
1 | niro | 92 | --- nxclient.orig 2006-09-03 13:13:31.000000000 -0700 |
2 | +++ nxclient 2006-08-21 13:44:23.000000000 -0700 | ||
3 | @@ -9,7 +9,7 @@ | ||
4 | # but we set it to a "good value" anyway in case | ||
5 | # it does check it someday. | ||
6 | # | ||
7 | -# CVS: $Id: nxserver-freenx-0.5.0-nxclient.patch,v 1.1 2007-01-04 23:21:10 niro Exp $ | ||
8 | +# SVN: $Id: nxserver-freenx-0.5.0-nxclient.patch,v 1.1 2007-01-04 23:21:10 niro Exp $ | ||
9 | # | ||
10 | # ======================================================================== | ||
11 | |||
12 | @@ -19,7 +19,7 @@ | ||
13 | [ -x "$NXCLIENT" -a "$(file -bi $NXCLIENT)" != 'application/x-shellscript' ] \ | ||
14 | && exec ${NXCLIENT} "$@" | ||
15 | |||
16 | -TEMP=`getopt -a -o d: --long local,noautokill,dialog:,caption:,message:,display:,printer: -n $(basename $0) -- "$@"` | ||
17 | +TEMP=`getopt -a -o d: --long local,noautokill,dialog:,caption:,message:,display:,printer:,parent: -n $(basename $0) -- "$@"` | ||
18 | |||
19 | if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi | ||
20 | |||
21 | @@ -32,6 +32,7 @@ | ||
22 | DIALOG_LOCAL="" | ||
23 | DIALOG_NOAUTOKILL="" | ||
24 | DIALOG_PRINTER="" | ||
25 | +DIALOG_PARENT="$PPID" | ||
26 | |||
27 | while true | ||
28 | do | ||
29 | @@ -43,6 +44,7 @@ | ||
30 | --noautokill) DIALOG_NOAUTOKILL="yes"; shift ;; | ||
31 | --display) DISPLAY="$2"; shift 2 ;; | ||
32 | --printer) DIALOG_PRINTER="$2"; shift 2 ; break ;; | ||
33 | + --parent) DIALOG_PARENT="$2"; shift 2 ;; | ||
34 | --) shift ; break ;; | ||
35 | *) echo "Internal error!" ; exit 1; ;; | ||
36 | esac | ||
37 | @@ -329,6 +331,6 @@ | ||
38 | # | ||
39 | |||
40 | RC=$? | ||
41 | - [ $RC -eq 2 ] && kill -TERM $PPID | ||
42 | - [ $RC -eq 3 ] && kill -HUP $PPID | ||
43 | + [ $RC -eq 2 ] && kill -TERM $DIALOG_PARENT | ||
44 | + [ $RC -eq 3 ] && kill -HUP $DIALOG_PARENT | ||
45 | exit 0 |