diff options
| author |   Eric Hameleers <alien@slackware.com> | 2016-02-12 12:39:37 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2016-02-12 12:39:37 +0000 |
| commit | 8df781c62b319d6df2fb561cf168b5e21875c782 (patch) | |
| tree | fcb1dde22b758276b567cc67674a3d7257c9f596 /libreoffice | |
| parent | 8214373d66336651ade63f5ad35331a672d4dbbe (diff) | |
| download | asb-8df781c62b319d6df2fb561cf168b5e21875c782.tar.gz asb-8df781c62b319d6df2fb561cf168b5e21875c782.tar.xz | |
libreoffice: fix for parsing a non-standard line in download.lst correctly.
Diffstat (limited to 'libreoffice')
| -rwxr-xr-x | libreoffice/build/gensrc.sh | 4 | ||||
| -rwxr-xr-x | libreoffice/build/gensrc_lo51.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libreoffice/build/gensrc.sh b/libreoffice/build/gensrc.sh index 70beea65..f05eff16 100755 --- a/libreoffice/build/gensrc.sh +++ b/libreoffice/build/gensrc.sh @@ -23,7 +23,7 @@ wget --no-check-certificate -q -O - "http://cgit.freedesktop.org/libreoffice/cor # Get the names of the tarballs we need: eval $( wget --no-check-certificate -q -O - "http://cgit.freedesktop.org/libreoffice/core/plain/configure.ac?id=$(echo $PRGNAM-$VERSION$SUBVER)" | grep UNOWINREG_DLL= ) echo "all:" >> $TMP_DLLST -cat $TMP_DLLST | grep -v " *#" | grep -w export | grep TARBALL | cut -f2 -d' ' | sed -e 's/.*/\t&=$(&)'/ >> $TMP_DLLST +cat $TMP_DLLST | grep -v " *#" | grep -w export | grep TARBALL | cut -f2 -d' ' | cut -f1 -d= | sed -e 's/.*/\t&=$(&)'/ >> $TMP_DLLST eval $(make HAVE_JAVA6=TRUE -f $TMP_DLLST) # Find the download site for a given tarball: @@ -31,7 +31,7 @@ find_url() { cat $TMP_FETCH | sed -n "/$1/,/fetch_Download_item/s/^.*fetch_Download_item[^,]*,\([^,]*\),.*$/\1/p" } -for BALL in UNOWINREG_DLL $( cat $TMP_DLLST | grep -v " *#" | grep -w export | grep TARBALL | cut -f2 -d' ' ); do +for BALL in UNOWINREG_DLL $( cat $TMP_DLLST | grep -v " *#" | grep -w export | grep TARBALL | cut -f2 -d' ' | cut -f1 -d= ); do SRCURL=$(find_url $BALL) FILE=$(eval "echo \$$BALL") diff --git a/libreoffice/build/gensrc_lo51.sh b/libreoffice/build/gensrc_lo51.sh index 70beea65..f05eff16 100755 --- a/libreoffice/build/gensrc_lo51.sh +++ b/libreoffice/build/gensrc_lo51.sh @@ -23,7 +23,7 @@ wget --no-check-certificate -q -O - "http://cgit.freedesktop.org/libreoffice/cor # Get the names of the tarballs we need: eval $( wget --no-check-certificate -q -O - "http://cgit.freedesktop.org/libreoffice/core/plain/configure.ac?id=$(echo $PRGNAM-$VERSION$SUBVER)" | grep UNOWINREG_DLL= ) echo "all:" >> $TMP_DLLST -cat $TMP_DLLST | grep -v " *#" | grep -w export | grep TARBALL | cut -f2 -d' ' | sed -e 's/.*/\t&=$(&)'/ >> $TMP_DLLST +cat $TMP_DLLST | grep -v " *#" | grep -w export | grep TARBALL | cut -f2 -d' ' | cut -f1 -d= | sed -e 's/.*/\t&=$(&)'/ >> $TMP_DLLST eval $(make HAVE_JAVA6=TRUE -f $TMP_DLLST) # Find the download site for a given tarball: @@ -31,7 +31,7 @@ find_url() { cat $TMP_FETCH | sed -n "/$1/,/fetch_Download_item/s/^.*fetch_Download_item[^,]*,\([^,]*\),.*$/\1/p" } -for BALL in UNOWINREG_DLL $( cat $TMP_DLLST | grep -v " *#" | grep -w export | grep TARBALL | cut -f2 -d' ' ); do +for BALL in UNOWINREG_DLL $( cat $TMP_DLLST | grep -v " *#" | grep -w export | grep TARBALL | cut -f2 -d' ' | cut -f1 -d= ); do SRCURL=$(find_url $BALL) FILE=$(eval "echo \$$BALL") |