osc-vnc 1.1.6 → 1.1.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/osc/vnc/version.rb +1 -1
- data/templates/script/server.mustache +4 -3
- data/templates/script/vnc.mustache +3 -2
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d64bbce9af7194df9f6ca9510bc03ac1da684658
|
|
4
|
+
data.tar.gz: 7f3d713ce061accc64fd411534d3876e56af9d0d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7222abb0bc044521a911f29d942651b6ed824fff3783e4a9476c5f61a1165e3e2dce1e75787bcfb71f4c1fd10359bd83d4b88fb9bed43381fd5a8a9806e4c93e
|
|
7
|
+
data.tar.gz: 30c96ca454d9e2e111cca94ce67f9ccd68e6e664d9030e6c53a1bea47c37d581607e12108e37e9b06ff007657ae5ab78608a9c3b7edaa12036949ffff9a943f1
|
data/lib/osc/vnc/version.rb
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
# Set some environment variables used by this script
|
|
2
2
|
{{> _setup_env}}
|
|
3
3
|
|
|
4
|
-
{{#xinit}}
|
|
5
4
|
# Bash helper functions
|
|
6
5
|
{{> _bash_helpers}}
|
|
7
6
|
|
|
7
|
+
# Set the host
|
|
8
|
+
HOST=$(hostname)
|
|
9
|
+
|
|
10
|
+
{{#xinit}}
|
|
8
11
|
# Run developer supplied xinit script
|
|
9
12
|
source {{xinit}}
|
|
10
13
|
{{/xinit}}
|
|
@@ -32,8 +35,6 @@ trap clean_up TERM EXIT
|
|
|
32
35
|
{{xstartup}} >> ${VNC_LOGFILE} 2>&1 &
|
|
33
36
|
SCRIPT_PID=$(pgrep -s 0 -f {{xstartup}})
|
|
34
37
|
|
|
35
|
-
{{> _ssh_tunnel}}
|
|
36
|
-
|
|
37
38
|
{{#after}}
|
|
38
39
|
# Run developer supplied after script
|
|
39
40
|
source {{after}}
|
|
@@ -2,6 +2,9 @@
|
|
|
2
2
|
{{> _setup_env}}
|
|
3
3
|
export VNC_PASSFILE={{outdir}}/${PBS_JOBID}.pass
|
|
4
4
|
|
|
5
|
+
# Set the host
|
|
6
|
+
HOST=$(hostname)
|
|
7
|
+
|
|
5
8
|
# Use turbovnc
|
|
6
9
|
{{{load_turbovnc}}}
|
|
7
10
|
|
|
@@ -52,8 +55,6 @@ PASSWORD=$(echo "${VNC_OUT}" | awk '/^Full/{print $NF}')
|
|
|
52
55
|
DISPLAY=:${DISPLAY_PORT} {{xstartup}} >> ${VNC_LOGFILE} 2>&1 &
|
|
53
56
|
SCRIPT_PID=$(pgrep -s 0 -f {{xstartup}})
|
|
54
57
|
|
|
55
|
-
{{> _ssh_tunnel}}
|
|
56
|
-
|
|
57
58
|
{{#novnc?}}
|
|
58
59
|
# Bash helper functions
|
|
59
60
|
{{> _bash_helpers}}
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: osc-vnc
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.1.
|
|
4
|
+
version: 1.1.7
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Jeremy Nicklas
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-01-
|
|
11
|
+
date: 2017-01-27 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: pbs
|