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

[X2Go dev team]

The branch, build-main has been updated
       via  4dae021e8cd56db4d194c912e1851b5e5b0b43d2 (commit)
      from  e8b312b4c4d2b99eae7cf08c130366d4cb18a834 (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 |   34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/x2gomountdirs b/x2gomountdirs
index 6d9424e..b7f2286 100755
--- a/x2gomountdirs
+++ b/x2gomountdirs
@@ -72,6 +72,8 @@ my $mdir="/tmp/$ENV{'USER'}_media";
 my $ldir="$ENV{'HOME'}/media";
 my $spooldir_lnk="$ENV{'HOME'}/.x2go/C-$session/spool";
 my $spooldir="/tmp/spool_$ENV{'USER'}";
+my $dropboxdir_lnk="$ENV{'HOME'}/.x2go/C-$session/dropbox";
+my $dropboxdir="/tmp/dropbox_$ENV{'USER'}";
 
 if(! -e $mdir)
 {
@@ -112,6 +114,19 @@ if(! -e $spooldir)
 }
 chmod(0700,$spooldir);
 
+if(! -e $dropboxdir)
+{
+   mkdir($dropboxdir);
+}
+chmod(0700,$dropboxdir);
+
+$dropboxdir="$dropboxdir/$session";
+if(! -e $dropboxdir)
+{
+   mkdir($dropboxdir);
+}
+chmod(0700,$dropboxdir);
+
 if( -d $ldir)
 {
     rmdir($ldir);
@@ -132,12 +147,23 @@ if( ! -l $spooldir_lnk)
    system ("ln -s $spooldir $spooldir_lnk");
 }
 
+if( -d $dropboxdir_lnk)
+{
+    rmdir($dropboxdir_lnk);
+}
+
+if( ! -l $dropboxdir_lnk)
+{
+   system ("ln -s $dropboxdir $dropboxdir_lnk");
+}
+
 my $uname=$ENV{'USER'};
 
 my @dirs=split(':',$dirlist);
 for(my $i=0;$i<@dirs;$i++)
 {
        my $printspool=0;
+       my $dropboxspool=0;
        my $mntpath;
        if(@dirs[$i]=~m/__PRINT_SPOOL_/)
        {
@@ -145,6 +171,12 @@ for(my $i=0;$i<@dirs;$i++)
             $printspool=1;
             $mntpath=$spooldir;
        }
+       elsif(@dirs[$i]=~m/__DROPBOX_SPOOL_/)
+       {
+            @dirs[$i]=~s/__DROPBOX_SPOOL_//;
+            $dropboxspool=1;
+            $mntpath=$dropboxdir;
+       }
        else
        {
             my $p=@dirs[$i];
@@ -197,7 +229,7 @@ for(my $i=0;$i<@dirs;$i++)
                         $useplasmoid=1;
                     }
                 }
-                if(! $printspool && ! $useplasmoid)
+                if(! $printspool && ! $dropboxspool && ! $useplasmoid)
                 {
                     my $fname="$ENV{'HOME'}/Desktop";
                     my $p=@dirs[$i];


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