Simplify script

some of the tweaks were done to make instdir/program/soffice.bin
work, but it doesn't work when using msiexec -a, so the
script can be simplified

Change-Id: I9ed8f7fc8a028d01a8e6d8ca982584a343897ba5

1 files changed, 17 insertions, 57 deletions

diff --git a/bibisect/buildWinReleasesRepository.sh b/bibisect/buildWinReleasesRepository.sh
index 97a4856c..8d54499b 100755
--- a/bibisect/buildWinReleasesRepository.sh
+++ b/bibisect/buildWinReleasesRepository.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
-
-#Sample: ./buildWinReleasesRepository.sh 6.3.0.0.alpha1 6.3.0.0.beta1 6.3.0.0.beta2 6.3.0.1 6.3.0.2 6.3.0.3 6.3.0.4
+# This script uses msiextract.
+# If you want to run it on Windows, use msiexec
+# Sample: ./buildWinReleasesRepository.sh 6.3.0.0.alpha1 6.3.0.0.beta1 6.3.0.0.beta2 6.3.0.1 6.3.0.2 6.3.0.3 6.3.0.4
 
 #Path to the folder where the msi/exe files are downloaded
 rootDir=
@@ -8,12 +9,6 @@ rootDir=
 #Path to the folder where 'win-86-releases' is
 targetDir=
 
-removeOriginFolders () {
-    echo "*** Removing files in origin"
-    rm -rf $rootDir/instdir
-    rm -rf  $rootDir/output
-}
-
 for var in "$@"
 do
     isExeFile=0
@@ -82,72 +77,37 @@ do
 
     if [[ ! -d $rootDir/output/Program\ Files/ ]]; then
         echo "$rootDir/output/Program\ Files doesn't exists"
-        removeOriginFolders
+        rm -rf  $rootDir/output
         break
     fi
 
     echo "*** Moving files to instdir folder"
     mv $rootDir/output/Program\ Files/* $rootDir/instdir
 
-    if [[ $input = "3."* || $input = "4."* ]]; then
-        echo "*** Moving files to program"
-        if [[ ! -d $rootDir/instdir/URE/bin/ ]]; then
-            echo "$rootDir/instdir/URE/bin/ doesn't exists"
-            removeOriginFolders
-            break
-        fi
-        mv $rootDir/instdir/URE/bin/*.dll $rootDir/instdir/program/
-
-        if [[ ! -d $rootDir/instdir/URE/misc/ ]]; then
-            echo "$rootDir/instdir/URE/misc/ doesn't exists"
-            removeOriginFolders
-            break
-        fi
-        mv $rootDir/instdir/URE/misc/*.rdb $rootDir/instdir/program/
-
-        # msvcp* and msvcr libraries
-        mv $rootDir/output/Win/System/*.dll $rootDir/instdir/program/
-
-        echo "*** Writing to uno.ini"
-        echo "[Bootstrap]
-URE_INTERNAL_LIB_DIR=\${ORIGIN}
-URE_INTERNAL_JAVA_DIR=\${ORIGIN}/classes
-URE_INTERNAL_JAVA_CLASSPATH=\${URE_MORE_JAVA_TYPES}
-UNO_TYPES=\${ORIGIN}/types.rdb \${URE_MORE_TYPES}
-UNO_SERVICES=\${ORIGIN}/services.rdb \${URE_MORE_SERVICES}" >>  $rootDir/instdir/program/uno.ini
-
-    else
+    if [ $isExeFile -eq 0 ]; then
         # msvcp* and msvcr libraries
-        mv $rootDir/output/System/*.dll $rootDir/instdir/program/
+        echo "*** Copying MSVC libraries"
+        if [[ $input = "3."* || $input = "4."* ]]; then
+            mv $rootDir/output/Win/System/*.dll $rootDir/instdir/program/
+        else
+            mv $rootDir/output/System/*.dll $rootDir/instdir/program/
+        fi
     fi
+    rm -rf $rootDir/output
 
+    # Change user profile folder
     echo "*** Changing bootstrap.ini"
     sed -i '/UserInstallation/d' $rootDir/instdir/program/bootstrap.ini
     echo "UserInstallation=\$ORIGIN/.." >> $rootDir/instdir/program/bootstrap.ini
 
     echo "*** Cleaning destination"
     rm -rf ${targetDir}/instdir/
-    mkdir ${targetDir}/instdir/
 
     echo "*** Moving files to destination"
-    mv $rootDir/instdir/program ${targetDir}/instdir/program
-    if [ $isExeFile -eq 1 ]; then
-        mv $rootDir/instdir/Basis ${targetDir}/instdir/Basis
-        mv $rootDir/instdir/basis-link ${targetDir}/instdir/basis-link
-    else
-        mv $rootDir/instdir/share ${targetDir}/instdir/share
-        mv $rootDir/instdir/presets ${targetDir}/instdir/presets
-
-        if [[ $input = "3."* || $input = "4."* ]]; then
-            # it makes .exe files to work
-            touch ${targetDir}/instdir/ure-link
-        fi
-
-        echo "*** Removing extensions"
-        rm -rf ${targetDir}/instdir/share/extensions/
-    fi
+    mv $rootDir/instdir/ ${targetDir}/instdir/
 
-    removeOriginFolders
+    echo "*** Removing extensions"
+    rm -rf ${targetDir}/instdir/share/extensions/
 
     cd ${targetDir}
     par1=libreoffice-$input
@@ -160,5 +120,5 @@ UNO_SERVICES=\${ORIGIN}/services.rdb \${URE_MORE_SERVICES}" >>  $rootDir/instdir
 done
 
 cd ${targetDir}
-git gc
+git gc --aggressive