From b38c5bfecfa7bbe3d57eceb8bbba4bfe11d5e93e Mon Sep 17 00:00:00 2001
From: Joachim Lingner <jl@openoffice.org>
Date: Thu, 3 Mar 2011 17:01:11 +0100
Subject: [PATCH] #i117186# call unopkg sync when building type installed or
 archive with the proper arguments, remove assertion from framework for the
 case that there is no user installation.

---
 solenv/bin/modules/installer/simplepackage.pm | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)
 mode change 100644 => 100755 solenv/bin/modules/installer/simplepackage.pm

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
old mode 100644
new mode 100755
index d76b81a55850..6148c88de376
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -127,25 +127,7 @@ sub register_extensions
 
         if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: $unopkgfile not found!", "register_extensions"); }
 
-        my $localtemppath = installer::systemactions::create_directories("uno", $languagestringref);
-
-        my $slash = "";
-
-        if ( $installer::globals::iswindowsbuild )
-        {
-            if ( $^O =~ /cygwin/i )
-            {
-                $localtemppath = $installer::globals::cyg_temppath;
-                $preregdir = qx{cygpath -m "$preregdir"};
-                chomp($preregdir);
-            }
-            $localtemppath =~ s/\\/\//g;
-            $slash = "/"; # Third slash for Windows. Other OS pathes already start with "/"
-        }
-
-        $preregdir =~ s/\/\s*$//g;
-
-        my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $slash . $preregdir . "\"" . " -env:UserInstallation=file://" . $slash . $localtemppath . " -env:UNO_JAVA_JFW_ENV_JREHOME=true 2\>\&1 |";
+        my $systemcall = $unopkgfile . " sync --verbose" . " -env:UNO_JAVA_JFW_ENV_JREHOME=true 2\>\&1 |";
 
         print "... $systemcall ...\n";