buildtree: set maintainer

bin/pkg/batchpkg.in

@@ -28,9 +28,9 @@ batch_move() {
         src=${src#*:}
         local dest=${entry%%:*}
         if ${runlist}; then
-            "${dest}"pkg -s "${src}" -u -p "${pkg}"
+            "${dest}"pkg -s "${src}" -p "${pkg}"
         else
-            msg "%s" "${dest}pkg -s ${src} -u -p ${pkg}"
+            msg "%s" "${dest}pkg -s ${src} -p ${pkg}"
         fi
     done < "$pkglist"
 }

bin/pkg/buildtree.in

@@ -40,7 +40,11 @@ pkgrepo_new(){
 
         prepare_dir "${TREE_DIR_ARTIX}/${group}/${package}/trunk"
 
-        commit_jenkins_files "${package}"
+        commit_ci "${package}"
+
+#         if braid push "${package}"; then
+#             braid update "${package}"
+#         fi
     else
         die "Package %s already exists!" "${package}"
     fi
@@ -106,11 +110,20 @@ update_tree() {
 
 #{{{ patch
 
+set_maintainer() {
+    local name email path="$1"
+    name=$(git config --get user.name)
+    email=$(git config --get user.email)
+    sed -e "1s|Maintainer:.*|Maintainer: $name <$email>|" \
+        -i "$path"/PKGBUILD
+}
+
 patch_pkg(){
     local pkgpath="$1"
     local pkg=${pkgpath%/*}
     pkg=${pkg##*/}
     sed -e 's|arch-meson|artix-meson|' -i "$pkgpath"/PKGBUILD
+    set_maintainer "$pkgpath"
     case $pkg in
         glibc)
             msg2 "Patching %s" "$pkg"

bin/pkg/commitpkg.in

@@ -133,15 +133,15 @@ run(){
         msg "Checking (%s) (Artix)" "${tree##*/}"
         pull_tree "${tree##*/}" "$head"
 
-        braid push "${package}"
-        braid update "${package}"
-
-        msg "Update (%s)" "${group##*/}"
-        git push origin master
-
-        git prune
-
-        [[ "${cmd}" != 'commitpkg' ]] && check_team
+        if braid push "${package}"; then
+            braid update "${package}"
+            msg "Update (%s)" "${tree##*/}"
+            git push origin master
+            git prune
+            [[ "${cmd}" != 'commitpkg' ]] && check_team
+        else
+            warning "'braid push %s' failed.\n" "${package}"
+        fi
     else
         die "Package '%s' does not exist!" "${package}"
     fi

lib/pkg/jenkins.sh

@@ -31,7 +31,7 @@ write_agentyaml(){
     git add "$agent"
 }
 
-commit_jenkins_files(){
+commit_ci(){
     local pkg="$1"
 
     write_jenkinsfile "$pkg"