[Libreoffice-commits] dev-tools.git: lo-submodules-from-bundles.sh

[Christian Lohmaier]

 lo-submodules-from-bundles.sh |   25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

New commits:
commit 869ad5b2b905f0283429303d857fca753598d847
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Thu Nov 26 20:12:29 2015 +0100

    lo-submodules-from-bundles.sh:  make script more portable and bullet-proof
    
    * use perl instead of sed (mac/bsd sed vs gnu sed is not worth the hassle
    * accept both wget or curl
    * check for used commands on startup (git, perl, wget or curl)
    * recommend "./g pull -r" instead of "git pull; git submodule update"

diff --git a/lo-submodules-from-bundles.sh b/lo-submodules-from-bundles.sh
index b75044c..20eebc6 100755
--- a/lo-submodules-from-bundles.sh
+++ b/lo-submodules-from-bundles.sh
@@ -19,7 +19,7 @@ $0 -a [-d downloaddir] [-t targetdir] SUBMODULES
                  in this directory before downloading them
                  (directory must exist)
     -t <path>    target directory, defaults to »$target_dir« (directory must
-		 not yet exist unless used with -a, then an existing directory
+                 not yet exist unless used with -a, then an existing directory
                  must be specified)
     -a           add submodules to an existing checkout without
                  submodules (be careful with that one)
@@ -64,11 +64,21 @@ help=false
 translations=false
 add_to_existing=false
 superrepo="libo"
+downloadtool="wget"
 
 function download {
     if ${!1}; then
+        bundle="libreoffice-$1.tar.bz2"
         cd "$download_dir"
-        wget -nc "$bundleurl/libreoffice-$1.tar.bz2"
+        if [ -e "$bundle" ]; then
+            echo "$bundle already exists - skipping download"
+        else
+            if [ $downloadtool = "wget" ]; then
+                wget "$bundleurl/$bundle"
+            else
+                curl -O "$bundleurl/$bundle"
+            fi
+        fi
         cd "$workdir"
     fi
 }
@@ -94,7 +104,7 @@ function submodulesetup {
         mv $reponame/.git $superrepo/.git/modules/$directory
         mv $reponame $superrepo/$directory
         echo "gitdir: ../.git/modules/$directory" > $superrepo/$directory/.git
-        sed -e "/logallrefupdates/a\\\tworktree = ../../../$directory" -e 's#anongit\.freedesktop\.org/libreoffice/#gerrit.libreoffice.org/#' -i $superrepo/.git/modules/$directory/config
+        perl -ni -e 's#anongit\.freedesktop\.org/libreoffice/#gerrit.libreoffice.org/# ; print ; print "\tworkdir = ../../../'$directory'\n" if /logallrefupdates/;' $superrepo/.git/modules/$directory/config
         cat <<EOF >> $superrepo/.git/config
 [submodule "$directory"]
 	url = git://gerrit.libreoffice.org/$reponame
@@ -120,6 +130,13 @@ while [ "${1:-}" != "" ] ; do
     shift
 done
 
+command -v wget >/dev/null 2>&1 || {
+    downloadtool="curl";
+    command -v curl >/dev/null 2>&1 || { echo >&2 "This script requires wget or curl - Aborting."; exit 1; }
+}
+command -v git  >/dev/null 2>&1 || { echo >&2 "This script requires git - Aborting."; exit 1; }
+command -v perl >/dev/null 2>&1 || { echo >&2 "This script requires perl - Aborting."; exit 1; }
+
 currentdir=$(pwd)
 if $add_to_existing ; then
     if [ ! -e "$target_dir" ] ; then
@@ -176,4 +193,4 @@ git submodule status
 
 cd $currentdir
 echo "everything done - your clone is in »$target_dir«"
-echo "do »git pull« (and »git submodule update«) to get the latest changes"
+echo "do »./g pull -r« from within $target_dir to get the latest changes"