1 |
--- smeserver-openoffice-portable-2.3.1/root/etc/e-smith/events/actions/openoffice-usersettings.inifile 2008-03-14 20:42:41.000000000 +0100 |
2 |
+++ smeserver-openoffice-portable-2.3.1/root/etc/e-smith/events/actions/openoffice-usersettings 2008-03-14 20:41:17.000000000 +0100 |
3 |
@@ -57,6 +57,8 @@ |
4 |
system( "/bin/mv $bootstrap_ini $bootstrap_ini.orig") if not -f "$bootstrap_ini.orig"; |
5 |
system( "/bin/sed -e 's:UserInstallation=.*:UserInstallation=//$ServerName/ooUserSettings/\$USERNAME\r:' < $bootstrap_ini.orig > $bootstrap_ini"); |
6 |
} |
7 |
+ my $OOP_ini ="/opt/openoffice/OpenOfficePortable/OpenOfficePortable.ini"; |
8 |
+ system("/bin/cp -a $OOP_ini.contrib $OOP_ini") if not -f $OOP_ini; |
9 |
} |
10 |
elsif( $self eq "openoffice-assoc-oo" ) |
11 |
{ |
12 |
@@ -149,10 +151,11 @@ |
13 |
mkdir "$settings/$username" if not -d "$settings/$username"; |
14 |
chown $uid, $gid, "$settings/$username"; |
15 |
chmod 0700, "$settings/$username"; |
16 |
- if( not -d "$settings/$username/user" && -d "/opt/openoffice/OpenOfficePortable/Data/settings/user" ) |
17 |
+ my $SDir="/opt/openoffice/OpenOfficePortable/Data/settings/user"; |
18 |
+ if( not -d "$settings/$username/user" && -d "$SDir" ) |
19 |
{ |
20 |
- system( "/bin/rm -f /opt/openoffice/OpenOfficePortable/Data/settings/user/registry/cache/*" ); |
21 |
- system( "/bin/cp -fR /opt/openoffice/OpenOfficePortable/Data/settings/user $settings/$username" ); |
22 |
+ system( "/bin/rm -f $SDir/registry/cache/*" ); |
23 |
+ system( "/bin/cp -fR $SDir $settings/$username" ); |
24 |
system( "/bin/chown -R $username.$username $settings/$username/user" ); |
25 |
|
26 |
|