[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.0.99-2-310-g9969476

[X2Go dev team]

The branch, build-main has been updated
       via  9969476427f8768934842700797355b3efe5dda7 (commit)
      from  316bce86012fa9122c38479ab792e5406f220055 (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:
 x2goserver/bin/x2gomountdirs      |   20 ++++++++++----------
 x2goserver/bin/x2goumount-session |   26 +++++++++++++-------------
 2 files changed, 23 insertions(+), 23 deletions(-)

The diff of changes is:
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index da0c2a7..7f926df 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -266,13 +266,13 @@ for (my $i=0;$i<@dirs;$i++)
 			{
 				my $fname="$ENV{'HOME'}/Desktop";
 				my $current_desktop = "";
-				if ($p =~ m/stDGNOME/)
+				if ($session =~ m/stDGNOME/)
 				{
-					$current_desktop="/GNOME";
+					$current_desktop="-gnome";
 				}
-				elsif ($p =~ m/stDLXDE/)
+				elsif ($session =~ m/stDLXDE/)
 				{
-					$current_desktop="/LXDE";
+					$current_desktop="-lxde";
 				}
 
 				my $p=@dirs[$i];
@@ -281,20 +281,20 @@ for (my $i=0;$i<@dirs;$i++)
 				$fname="$fname/$p";
 				if ($type eq "dir")
 				{
-					$fname="$fname (sshfs-disk$current_desktop)";
-					syslog('info', "creating desktop icon for @dirs[$i], media type is: client-side folder on harddrive");
+					$fname="$fname\ (sshfs-disk$current_desktop)";
+					syslog('info', "creating desktop icon for ,, at dirs[$i]'' at ,,$fname'', media type is: client-side folder on harddrive");
 				}
 				else
 				{
 					if ($fname =~ m/CDROM/)
 					{
-						$fname="$fname (sshfs-cdrom$current_desktop)";
-						syslog('info', "creating desktop icon for @dirs[$i], media type is: optical disc");
+						$fname="$fname\ (sshfs-cdrom$current_desktop)";
+						syslog('info', "creating desktop icon for ,, at dirs[$i]'' at ,,$fname'', media type is: optical disc");
 					}
 					else
 					{
-						$fname="$fname (sshfs-removable$current_desktop)";
-						syslog('info', "creating desktop icon for @dirs[$i], media type is: removable device");
+						$fname="$fname\ (sshfs-removable$current_desktop)";
+						syslog('info', "creating desktop icon for ,, at dirs[$i]'' at ,,$fname'', media type is: removable device");
 					}
 					$fname=~s/_ramdrive_mnt_//;
 				}
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index 1f5fa0d..971c689 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -128,30 +128,30 @@ break:
 		$remote="$ENV{'HOME'}/Desktop/$remote";
 
 		my $current_desktop = '';
-		if ($p =~ m/stDGNOME/)
+		if ($session =~ m/stDGNOME/)
 		{
-			$current_desktop="/GNOME";
+			$current_desktop="-gnome";
 		}
-		elsif ($p =~ m/stDLXDE/)
+		elsif ($session =~ m/stDLXDE/)
 		{
-			$current_desktop="/LXDE";
+			$current_desktop="-lxde";
 		}
 
-		if ( -e "$remote (sshfs-disk$current_desktop)")
+		if ( -e "$remote\ (sshfs-disk$current_desktop)")
 		{
-		    syslog('info', "removing desktop icon $remote(sshfs-disk$current_desktop)");
-		    unlink("$remote (sshfs-disk$current_desktop)");
+		    syslog('info', "removing desktop icon ,,$remote (sshfs-disk$current_desktop)''");
+		    unlink("$remote\ (sshfs-disk$current_desktop)");
 		}
 		$remote=~s/%2framdrive%2fmnt%2f//;
-		if ( -e "$remote (sshfs-removable$current_desktop)")
+		if ( -e "$remote\ (sshfs-removable$current_desktop)")
 		{
-			syslog('info', "removing desktop icon $remote(sshfs-removable$current_desktop)");
-			unlink("$remote (sshfs-removable$current_desktop)");
+			syslog('info', "removing desktop icon ,,$remote\ (sshfs-removable$current_desktop)''");
+			unlink("$remote\ (sshfs-removable$current_desktop)");
 		}
-		if ( -e "$remote (sshfs-cdrom/$current_desktop)")
+		if ( -e "$remote\ (sshfs-cdrom/$current_desktop)")
 		{
-			syslog('info', "removing desktop icon $remote (sshfs-cdrom$current_desktop)");
-			unlink("$remote (sshfs-cdrom$current_desktop)");
+			syslog('info', "removing desktop icon ,,$remote\ (sshfs-cdrom$current_desktop)''");
+			unlink("$remote\ (sshfs-cdrom$current_desktop)");
 		}
 		db_deletemount ($session, @line[1]);
 		rmdir (@line[1]);


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

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 "x2goserver.git" (X2Go Server).