Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
ssh_scripts
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sofiane Bendoukha
ssh_scripts
Commits
a124b219
Commit
a124b219
authored
7 years ago
by
Mathis Rosenhauer
Browse files
Options
Downloads
Patches
Plain Diff
Look for vncviewer in search path by default
parent
301181ae
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
startvnc
+8
-9
8 additions, 9 deletions
startvnc
with
8 additions
and
9 deletions
startvnc
+
8
−
9
View file @
a124b219
...
...
@@ -54,8 +54,8 @@ set -eu
# You can change the settings here or override them with command line
# options. SVNC_ACCTCODE is the only parameter you have to provide if
# your local username matches your username on the frontend and if
# vncviewer is installed in the s
tandard location
(tight/tigervnc on
#
Linux
for example).
# vncviewer is installed in the s
earch path
(tight/tigervnc on
Linux
# for example).
# Project account code
SVNC_ACCTCODE
=
""
...
...
@@ -68,10 +68,9 @@ SVNC_USERNAME=$(id -un)
# Path to local vncviewer
#
# On Linux and other Unix systems chances are that vncviewer is
# installed in /usr/bin. If this is not the case, e.g. if you use
# TurboVNC or if you are on macOS, then change this parameter.
SVNC_VNCVIEWER
=
"/usr/bin/vncviewer"
# If your local vnc client is not in the search path or named
# differently (e.g. TurboVNC, macOS), then change this parameter.
SVNC_VNCVIEWER
=
"vncviewer"
# Resolution of remote desktop window
#
...
...
@@ -113,13 +112,13 @@ clean_up () {
set
+e
if
[[
-n
${
vnc_host
:-}
]]
;
then
echo
"Killing vncserver :
${
vnc_display
}
on
${
vnc_host
}
."
echo
"Killing vncserver :
${
vnc_display
}
on
${
vnc_host
}
."
ssh_frontend
"ssh
${
vnc_host
}
\"
/opt/TurboVNC/bin/vncserver
\
-kill :
${
vnc_display
}
\"
"
fi
if
[[
-n
${
job_id
:-}
]]
;
then
echo
"Removing job
${
job_id
}
."
echo
"Removing job
${
job_id
}
."
ssh_frontend
"scancel -Q
${
job_id
}
; sleep 1;
\
cd .startvnc && rm -f out.
${
job_id
}
"
else
...
...
@@ -252,7 +251,7 @@ main () {
local
vnc_options
=
"
${
SVNC_VNC_OPTIONS
:-}
\
-via
${
SVNC_USERNAME
}
@
${
vnc_host
}
.dkrz.de"
if
[[
${
SVNC_PASSWORD
}
=
"true"
]]
;
then
echo
"Fetching password from frontend."
echo
"Fetching password from frontend."
ssh_frontend
"cat .vnc/passwd"
>
${
HOME
}
/vnc_passwd
vnc_options+
=
" -passwd
${
HOME
}
/vnc_passwd"
fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment