Merge branch 'master' into verbose-rewrite

This commit is contained in:
Daniel Martí 2013-11-03 11:53:36 +01:00
commit 223b0ea061
2 changed files with 51 additions and 32 deletions

View file

@ -217,6 +217,11 @@ _fdroid_checkupdates_project() {
__complete_checkupdates __complete_checkupdates
} }
_fd-commit() {
__package
}
complete -F _fdroid fdroid complete -F _fdroid fdroid
complete -F _fd-commit fd-commit
return 0 return 0

View file

@ -8,13 +8,28 @@ while read line; do
if [[ "$line" == *M*metadata/*.txt ]]; then if [[ "$line" == *M*metadata/*.txt ]]; then
file=${line##* } file=${line##* }
while read l; do
[[ "$l" == "Auto Name:"* ]] && name=${l##*:}
done < "$file"
id=${file##*/} id=${file##*/}
id=${id%.txt*} id=${id%.txt*}
if [ $# -gt 0 ]; then
found=false
for arg in "$@"; do
if [ "$id" == "$arg" ]; then
found=true
break
fi
done
$found || continue
fi
[ -d metadata/$id ] && extra=metadata/$id [ -d metadata/$id ] && extra=metadata/$id
while read l; do
if [[ "$l" == "Auto Name:"* ]]; then
name=${l##*:}
break
fi
done < "$file"
[ -n "$name" ] && id="$name ($id)" [ -n "$name" ] && id="$name ($id)"
newbuild=0 newbuild=0
@ -28,8 +43,7 @@ while read line; do
fi fi
done < <(git diff HEAD -- "$file") done < <(git diff HEAD -- "$file")
if [ $newbuild -eq 0 ] if [ $newbuild -eq 0 ]; then
then
message="$id:" message="$id:"
else else
message="Update $id to $version ($vercode)" message="Update $id to $version ($vercode)"