The branch, build-baikal has been updated via f1c4f7f08cf0669a70bbce3b45cd58cdbe87944c (commit) from c955ffbf33840777e63e05c9ce747134736cc328 (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: x2gomountdirs | 112 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 56 insertions(+), 56 deletions(-) The diff of changes is: diff --git a/x2gomountdirs b/x2gomountdirs index 71c277a..6d9424e 100755 --- a/x2gomountdirs +++ b/x2gomountdirs @@ -2,7 +2,7 @@ use strict; use lib "/usr/lib/x2go"; -use x2godbwrapper; +use x2godbwrapper; my $type=shift; my $session=shift; @@ -152,13 +152,13 @@ for(my $i=0;$i<@dirs;$i++) { $p=~s/\/ramdrive\/mnt\///; if($p =~ m/CDROM/) - { - $mdir=$mdir."/cd"; - } - else - { - $mdir=$mdir."/rm"; - } + { + $mdir=$mdir."/cd"; + } + else + { + $mdir=$mdir."/rm"; + } } else @@ -182,56 +182,56 @@ for(my $i=0;$i<@dirs;$i++) } print "inserted,\nsshfs $code_conv -o IdentityFile=$key,UserKnownHostsFile=$key.ident $user\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port\n"; if(system("sshfs $code_conv -o ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident $user\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 2>>~/mounts.log")==0) - { - print "mount @dirs[$i] ok\n"; - - # check if kde4 plasmoid running - my $useplasmoid=0; - if( -e $plasmstamp ) - { - open(STMP,"<$plasmstamp"); - my $stamp=<STMP>; - close (STMP); - if(abs($stamp-time())<15) - { - $useplasmoid=1; - } - } - if(! $printspool && ! $useplasmoid) - { - my $fname="$ENV{'HOME'}/Desktop"; - my $p=@dirs[$i]; - $p=~s/\/cygdrive\///g; - $p=~s/\//_/g; - $fname="$fname/$p"; - if($type eq "dir") - { - $fname="$fname(sshfs-disk)"; - } - else - { - if($fname =~ m/CDROM/) - { - $fname="$fname(sshfs-cdrom)"; - } - else - { - $fname="$fname(sshfs-removable)"; - } - $fname=~s/_ramdrive_mnt_//; - } - print "fname: $fname\n"; - open(F,">$fname"); - print F "$mntpath\n$session\n\n\0"; - close(F); - } - } - else - { + { + print "mount @dirs[$i] ok\n"; + + # check if kde4 plasmoid running + my $useplasmoid=0; + if( -e $plasmstamp ) + { + open(STMP,"<$plasmstamp"); + my $stamp=<STMP>; + close (STMP); + if(abs($stamp-time())<15) + { + $useplasmoid=1; + } + } + if(! $printspool && ! $useplasmoid) + { + my $fname="$ENV{'HOME'}/Desktop"; + my $p=@dirs[$i]; + $p=~s/\/cygdrive\///g; + $p=~s/\//_/g; + $fname="$fname/$p"; + if($type eq "dir") + { + $fname="$fname(sshfs-disk)"; + } + else + { + if($fname =~ m/CDROM/) + { + $fname="$fname(sshfs-cdrom)"; + } + else + { + $fname="$fname(sshfs-removable)"; + } + $fname=~s/_ramdrive_mnt_//; + } + print "fname: $fname\n"; + open(F,">$fname"); + print F "$mntpath\n$session\n\n\0"; + close(F); + } + } + else + { print "mount @dirs[$i] failed\n"; db_deletemount( $session, $mntpath); - rmdir($mntpath); - } + rmdir($mntpath); + } } else { 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).