Attachment 104013 Details for Bug 82144 – Possible Fix

[patch] Possible Fix

possible.patch (text/plain), 1.37 KB, created by Armin K on 2014-08-04 18:39:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Armin K

Created: 2014-08-04 18:39:55 UTC

Size: 1.37 KB

patch

obsolete

>--- a/bin/unpack-sources	2014-07-25 02:38:16.000000000 +0200
>+++ b/bin/unpack-sources	2014-08-04 20:37:53.741766725 +0200
>@@ -52,7 +52,7 @@
>     echo "Error: Please, define where to unpack sources, try --help"
> fi
> 
>-if ! test -f $start_dir/Repository.mk -a -f $start_dir/solenv/inc/target.mk ; then
>+if ! test -f $start_dir/Repository.mk ; then
>     echo "Error: $start_dir is not a valid LibreOffice core source directory"
>     exit 1;
> fi
>@@ -74,14 +74,18 @@
>     fi
> 
>     echo "Unpacking $tarname..."
>-    echo tar -xf "$tarball" -C "$lo_src_dir"
>-    if ! tar -xf "$tarball" -C "$lo_src_dir"; then
>+    echo mkdir -p "$lo_src_dir/$tarname"
>+    if ! mkdir -p "$lo_src_dir/$tarname" ; then
>+        echo "Error: could not create directory $lo_src_dir/$tarname"
>+    fi
>+    echo tar -xf "$tarball" -C "$lo_src_dir/$tarname" --strip-components=1
>+    if ! tar -xf "$tarball" -C "$lo_src_dir/$tarname" --strip-components=1; then
>         echo "Error: could not unpack $tarname"
>         exit 1
>     fi
> 
>     # create symlinks for module directories; ignore git-hooks directory
>-    for dir in `find "$lo_src_dir/$tarname" -mindepth 1 -maxdepth 1 -type d -path $lo_src_dir/$tarname/git-hooks -o -printf "$tarname/%f\n"` ; do
>-        ln -sf "src/$dir" "$start_dir"
>+    for dir in `find "$lo_src_dir/$tarname" -mindepth 1 -maxdepth 1 -type d` ; do
>+        ln -sf "$dir" "$start_dir"
>     done
> done

Actions: View

Attachments on bug 82144: 104013