[X2go-Commits] x2gothinclient.git - master (branch) updated: 3331a0057c0ff4a967351911fd0e51c2d2be2d38

[X2go dev team]

The branch, master has been updated
       via  3331a0057c0ff4a967351911fd0e51c2d2be2d38 (commit)
      from  13467ff99ffe11ef1d106a636efdb72a0147bc2b (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 -----------------------------------------------------------------
commit 3331a0057c0ff4a967351911fd0e51c2d2be2d38
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jun 29 21:37:45 2011 +0200

    Adapt chroot file created by x2gothinclient_upgrade, escaping $-signs.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    1 +
 .../sbin/x2gothinclient_upgrade                    |   14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 9a43961..d6df0d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,7 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low
     (Fb vs. Xorg). 
   * Move kernel/initrd symlinks after install rather than copying. 
   * Add detection of kernel upgrades to x2gothinclient_upgrade script. 
+  * Adapt chroot file created by x2gothinclient_upgrade, escaping $-signs. 
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 28 May 2011 12:04:34 +0200
 
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
index 3728dde..2d01390 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
@@ -45,7 +45,7 @@ test -e "$TC_CHROOT" || {
     exit -2
 }
 
-cat > "$TC_CHROOT/x2go_tc_update.sh" <<EOF
+cat > "$TC_CHROOT/x2go_tce_upgrade.sh" <<EOF
 #!/bin/bash
 mount /proc &> /dev/null
 mount /dev/pts &> /dev/null
@@ -66,10 +66,10 @@ chmod +x /sbin/start-stop-daemon
 
 # check for kernel upgrades
 for symlink in /vmlinuz /vmlinuz.old /initrd.img /initrd.img.old; do
-    if [ -h $symlink ]; then
-	symlink_target=$(ls -l "$symlink" | awk '{print $11}')
-	echo $symlink_target | egrep ".*-486$" >/dev/null && mv $symlink \${symlink/.old/}.486
-	echo $symlink_target | egrep ".*-686$" >/dev/null && mv $symlink \${symlink/.old/}.686
+    if [ -h \$symlink ]; then
+	symlink_target=\$(ls -l "\$symlink" | awk '{print \$11}')
+	echo \$symlink_target | egrep ".*-486$" >/dev/null && mv \$symlink \${symlink/.old/}.486
+	echo \$symlink_target | egrep ".*-686$" >/dev/null && mv \$symlink \${symlink/.old/}.686
     fi
 done
 
@@ -83,5 +83,5 @@ echo
 echo "X2go Thin Client Shell upgrade has finished."
 echo
 EOF
-chmod u+x "$TC_CHROOT/x2go_tc_update.sh"
-chroot "$TC_CHROOT" /x2go_tc_update.sh
+chmod u+x "$TC_CHROOT/x2go_tce_upgrade.sh"
+chroot "$TC_CHROOT" /x2go_tce_upgrade.sh


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).