[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99-2-20-gd352a2b
X2Go dev team
git-admin at x2go.org
Wed Dec 4 06:21:11 CET 2013
The branch, build-baikal has been updated
via d352a2b49a9e2461c21c61df072a12c2042d1a74 (commit)
from cdeae3915776ceee9df5687893728312df2e963e (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 | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
The diff of changes is:
diff --git a/x2gomountdirs b/x2gomountdirs
index b7f2286..d436066 100755
--- a/x2gomountdirs
+++ b/x2gomountdirs
@@ -72,8 +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'}";
+my $mimeboxdir_lnk="$ENV{'HOME'}/.x2go/C-$session/mimebox";
+my $mimeboxdir="/tmp/mimebox_$ENV{'USER'}";
if(! -e $mdir)
{
@@ -114,18 +114,18 @@ if(! -e $spooldir)
}
chmod(0700,$spooldir);
-if(! -e $dropboxdir)
+if(! -e $mimeboxdir)
{
- mkdir($dropboxdir);
+ mkdir($mimeboxdir);
}
-chmod(0700,$dropboxdir);
+chmod(0700,$mimeboxdir);
-$dropboxdir="$dropboxdir/$session";
-if(! -e $dropboxdir)
+$mimeboxdir="$mimeboxdir/$session";
+if(! -e $mimeboxdir)
{
- mkdir($dropboxdir);
+ mkdir($mimeboxdir);
}
-chmod(0700,$dropboxdir);
+chmod(0700,$mimeboxdir);
if( -d $ldir)
{
@@ -147,14 +147,14 @@ if( ! -l $spooldir_lnk)
system ("ln -s $spooldir $spooldir_lnk");
}
-if( -d $dropboxdir_lnk)
+if( -d $mimeboxdir_lnk)
{
- rmdir($dropboxdir_lnk);
+ rmdir($mimeboxdir_lnk);
}
-if( ! -l $dropboxdir_lnk)
+if( ! -l $mimeboxdir_lnk)
{
- system ("ln -s $dropboxdir $dropboxdir_lnk");
+ system ("ln -s $mimeboxdir $mimeboxdir_lnk");
}
my $uname=$ENV{'USER'};
@@ -163,7 +163,7 @@ my @dirs=split(':',$dirlist);
for(my $i=0;$i<@dirs;$i++)
{
my $printspool=0;
- my $dropboxspool=0;
+ my $mimeboxspool=0;
my $mntpath;
if(@dirs[$i]=~m/__PRINT_SPOOL_/)
{
@@ -171,11 +171,11 @@ for(my $i=0;$i<@dirs;$i++)
$printspool=1;
$mntpath=$spooldir;
}
- elsif(@dirs[$i]=~m/__DROPBOX_SPOOL_/)
+ elsif(@dirs[$i]=~m/__MIMEBOX_SPOOL_/)
{
- @dirs[$i]=~s/__DROPBOX_SPOOL_//;
- $dropboxspool=1;
- $mntpath=$dropboxdir;
+ @dirs[$i]=~s/__MIMEBOX_SPOOL_//;
+ $mimeboxspool=1;
+ $mntpath=$mimeboxdir;
}
else
{
@@ -229,7 +229,7 @@ for(my $i=0;$i<@dirs;$i++)
$useplasmoid=1;
}
}
- if(! $printspool && ! $dropboxspool && ! $useplasmoid)
+ if(! $printspool && ! $mimeboxspool && ! $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).
More information about the x2go-commits
mailing list