guacamole-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmuehl...@apache.org
Subject [1/2] incubator-guacamole-client git commit: GUACAMOLE-100: Use contents of provided GUACAMOLE_HOME as the basis for GUACAMOLE_HOME generated by the Docker container.
Date Fri, 11 Nov 2016 22:58:57 GMT
Repository: incubator-guacamole-client
Updated Branches:
  refs/heads/master 9240dd82c -> f9049d2e2


GUACAMOLE-100: Use contents of provided GUACAMOLE_HOME as the basis for GUACAMOLE_HOME generated
by the Docker container.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/ebbed755
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/ebbed755
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/ebbed755

Branch: refs/heads/master
Commit: ebbed755500a27b75b56199cfb76c2e529154b20
Parents: 9240dd8
Author: Michael Jumper <mjumper@apache.org>
Authored: Thu Sep 1 23:00:25 2016 -0700
Committer: Michael Jumper <mjumper@apache.org>
Committed: Fri Nov 11 10:20:33 2016 -0800

----------------------------------------------------------------------
 guacamole-docker/bin/start.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/ebbed755/guacamole-docker/bin/start.sh
----------------------------------------------------------------------
diff --git a/guacamole-docker/bin/start.sh b/guacamole-docker/bin/start.sh
index c17f0ad..e45440b 100755
--- a/guacamole-docker/bin/start.sh
+++ b/guacamole-docker/bin/start.sh
@@ -28,6 +28,8 @@
 ## script, running in the foreground until terminated.
 ##
 
+GUACAMOLE_HOME_TEMPLATE="$GUACAMOLE_HOME"
+
 GUACAMOLE_HOME="$HOME/.guacamole"
 GUACAMOLE_EXT="$GUACAMOLE_HOME/extensions"
 GUACAMOLE_LIB="$GUACAMOLE_HOME/lib"
@@ -342,6 +344,14 @@ start_guacamole() {
 rm -Rf "$GUACAMOLE_HOME"
 
 #
+# Copy contents of provided GUACAMOLE_HOME template, if any
+#
+
+if [ -n "$GUACAMOLE_HOME_TEMPLATE" ]; then
+    cp -a "$GUACAMOLE_HOME_TEMPLATE/." "$GUACAMOLE_HOME/"
+fi
+
+#
 # Create and define Guacamole lib and extensions directories
 #
 


Mime
View raw message