The branch, build-main has been updated via d7ce549428428b76c605a24c6d117fac2072358c (commit) from a449f64ce0b6054485d90da45092d7b306405cd3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../sbin/x2gothinclient_cleanup | 16 +++++++++++----- .../sbin/x2gothinclient_create | 4 +++- .../sbin/x2gothinclient_preptftpboot | 3 ++- x2gothinclientmanagement/sbin/x2gothinclient_shell | 3 ++- .../sbin/x2gothinclient_update | 6 ++++-- .../sbin/x2gothinclient_upgrade | 3 ++- 7 files changed, 25 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2f360a0..1ae3cae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2gothinclient (1.0.1.9-0~x2go1) UNRELEASED; urgency=low * New upstream version (1.0.1.9): - When X2Go TCE has plymouth installed, make sure pressing the halt button does not change to the wrong tty. + - Truncate echo output lines to less than 80 chars. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup index 98855fd..c17ab19 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup +++ b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup @@ -38,14 +38,17 @@ TC_CONFIG="${TC_CONFIG:-$TC_BASE/etc}" TC_TFTP_BOOT="${TC_TFTP_BOOT:-/srv/tftp}" [ "x$USER" == "xroot" ] || { - echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." + echo "ERROR: X2Go Thin Client management scripts have to run" + echo "as super-user root." exit -2 } echo "X2go TCE cleanup..." echo "-------------------" -echo "Hit <RETURN> to purge all X2Go TCE related files (chroot, TCE config, PXE boot env)..." +echo "Hit <RETURN> to purge all X2Go TCE related files (chroot," +echo "TCE config, PXE boot env)..." +echo echo "Alternatively, hit STRG-C to cancel the operation now!!!" read @@ -54,13 +57,15 @@ test -e "$TC_CHROOT" && { echo "Removing $TC_CHROOT..." rm -Rf "${TC_CHROOT}" } || { - echo "WARNING: X2Go Thin Client chroot does not exist at $TC_CHROOT. No cleanup necessary..." + echo "WARNING: X2Go Thin Client chroot does not exist" + echo "at $TC_CHROOT. No cleanup necessary..." } test -e "$TC_CONFIG" && { echo "Removing $TC_CONFIG..." rm -Rf "${TC_CONFIG}" } || { - echo "WARNING: X2Go Thin Client config does not exist at $TC_CONFIG. No cleanup necessary..." + echo "WARNING: X2Go Thin Client config does not exist" + echo "at $TC_CONFIG. No cleanup necessary..." } ### PXE/Syslinux @@ -68,7 +73,8 @@ test -e "$TC_TFTP_BOOT/pxelinux.cfg" && { echo "Emptying $TC_TFTP_BOOT..." rm -Rf "${TC_TFTP_BOOT}"/* } || { - echo "WARNING: X2Go PXE/Syslinux boot environment does not exist at $TC_TFTP_BOOT. No cleanup necessary..." + echo "WARNING: X2Go PXE/Syslinux boot environment does not exist" + echo "at $TC_TFTP_BOOT. No cleanup necessary..." } echo diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index a14ae17..434ec14 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -53,7 +53,9 @@ test -e "$TC_CHROOT" && { exit -2 } -echo "Hit <RETURN> to continue with X2Go TCE chroot creation using the above TCE parameters..." +echo "Hit <RETURN> to continue with X2Go TCE chroot creation using" +echo "the above TCE parameters..." +echo echo "Alternatively, hit STRG-C to cancel the operation now!!!" read diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot b/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot index a011f8b..1dd9101 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot +++ b/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot @@ -49,7 +49,8 @@ test -e "$TC_TFTP_BOOT/pxelinux.cfg" && { } [ "x$USER" == "xroot" ] || { - echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." + echo "ERROR: X2Go Thin Client management scripts have to run" + echo "as super-user root." exit -2 } diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 625bb16..3360dda 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -42,7 +42,8 @@ test -e "$TC_CHROOT" || { } [ "x$USER" == "xroot" ] || { - echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." + echo "ERROR: X2Go Thin Client management scripts have to run" + echo "as super-user root." exit -2 } diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_update b/x2gothinclientmanagement/sbin/x2gothinclient_update index 4df9ff3..24f2d8b 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_update +++ b/x2gothinclientmanagement/sbin/x2gothinclient_update @@ -43,12 +43,14 @@ test -e "$TC_CHROOT" || { } test -e "$TC_CONFIG" || { - echo "ERROR: No X2Go Thin Client configuration found at $TC_CONFIG. Please check..." + echo "ERROR: No X2Go Thin Client configuration found" + echo "at $TC_CONFIG. Please check..." exit -1 } [ "x$USER" == "xroot" ] || { - echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." + echo "ERROR: X2Go Thin Client management scripts have to run" + echo "as super-user root." exit -2 } diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index a206837..dbf804e 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -41,7 +41,8 @@ test -e "$TC_CHROOT" || { } [ "x$USER" == "xroot" ] || { - echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." + echo "ERROR: X2Go Thin Client management scripts have to run" + echo "as super-user root." exit -2 } hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gothinclient.git" (X2Go Thin Client Environment).