colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libreoffice: generate-libreoffice-srcs.sh: take into account that LO now sometimes lets the checksum go after the tarball

Browse Source
This commit is contained in:
Michael Raskin 2016-09-12 12:45:14 +02:00
parent 49f4ba7ae0
commit 242cea8a63
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
View File

@ -18,20 +18,27 @@ write_entry(){
eval "echo -n \"\$additions_${name%%[-_.]*}\"" eval "echo -n \"\$additions_${name%%[-_.]*}\""
eval "test -n \"\$additions_${name%%[-_.]*}\" && echo" eval "test -n \"\$additions_${name%%[-_.]*}\" && echo"
echo '}' echo '}'
saved_line=
} }
saved_line=
cat "$(dirname "$0")/libreoffice-srcs-additions.sh" "$@" | cat "$(dirname "$0")/libreoffice-srcs-additions.sh" "$@" |
while read line; do while read line; do
case "$line" in case "$line" in
EVAL\ *) EVAL\ *)
echo "${line#* }" >&2; echo "${line#* }" >&2;
eval "${line#* }"; eval "${line#* }";
saved_line=
;; ;;
\#*) \#*)
echo Skipping comment: "$line" >&2; echo Skipping comment: "$line" >&2;
;; ;;
*_MD5SUM\ :=*) *_MD5SUM\ :=*)
read tbline; if test -n "$saved_line"; then
tbline="$saved_line"
else
read tbline;
fi;
line=${line##* }; line=${line##* };
line=${line##*:=}; line=${line##*:=};
if [ "${tbline#*VERSION_MICRO}" != "$tbline" ]; then if [ "${tbline#*VERSION_MICRO}" != "$tbline" ]; then
@ -59,7 +66,11 @@ while read line; do
name=${line:33}; name=${line:33};
name="${name%)}" name="${name%)}"
brief=false; brief=false;
write_entry; if test -n "$name"; then
write_entry;
else
saved_line="$line";
fi
;; ;;
*) *)
echo Skipping: "$line" >&2; echo Skipping: "$line" >&2;