Merge branch 'add-local_copy_dir-and-v0.2-fixes' of https://gitlab.com/eighthave...

[fdroidserver.git] / fd-commit

diff --git a/fd-commit b/fd-commit
index e65f2ced81204b87aa5c04f9ddd5399d73f06845..e4012de58838535d0bd1da8186ef026aaa003e57 100755 (executable)
--- a/fd-commit
+++ b/fd-commit
@@ -30,41 +30,48 @@ if [ ! -d metadata ]; then
 fi
 
 while read line; do
-       if [[ "$line" == *M*metadata/*.txt ]]; then
-               file=${line##* }
-
-               id=${file##*/}
-               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 || extra=
+       if [[ "$line" == *\?\?*metadata/*.txt ]]; then
+               new=true
+       elif [[ "$line" == *M*metadata/*.txt ]]; then
+               new=false
+       fi
+       file=${line##* }
 
-               name= autoname=
-               while read l; do
-                       if [[ "$l" == "Auto Name:"* ]]; then
-                               autoname=${l#*:}
-                       elif [[ "$l" == "Name:"* ]]; then
-                               name=${l#*:}
+       id=${file##*/}
+       id=${id%.txt*}
+       if [ $# -gt 0 ]; then
+               found=false
+               for arg in "$@"; do
+                       if [ "$id" == "$arg" ]; then
+                               found=true
+                               break
                        fi
-               done < "$file"
+               done
+               $found || continue
+       fi
 
-               if [ -n "$name" ]; then
-                       fullname="$name"
-               elif [ -n "$autoname" ]; then
-                       fullname="$autoname"
-               else
-                       fullname="$id"
+       [ -d metadata/$id ] && extra=metadata/$id || extra=
+
+       name= autoname=
+       while read l; do
+               if [[ "$l" == "Auto Name:"* ]]; then
+                       autoname=${l#*:}
+               elif [[ "$l" == "Name:"* ]]; then
+                       name=${l#*:}
                fi
+       done < "$file"
+
+       if [ -n "$name" ]; then
+               fullname="$name"
+       elif [ -n "$autoname" ]; then
+               fullname="$autoname"
+       else
+               fullname="$id"
+       fi
 
+       if $new; then
+               message="New app: $fullname"
+       else
                onlybuild=true
                newbuild=false
                disable=false
@@ -97,11 +104,11 @@ while read line; do
                else
                        message="$fullname:"
                fi
-
-               message=${message//\"/\\\"}
-               commands+=("git add -- $file $extra && git commit -m \"$message\" -e -v")
        fi
-done < <(git status --porcelain)
+
+       message=${message//\"/\\\"}
+       commands+=("git add -- $file $extra && git commit -m \"$message\" -e -v")
+done < <(git status --porcelain metadata)
 
 [[ -z $commands ]] && exit 0