Compare commits

..

4 Commits

Author SHA1 Message Date
2ba8cb4fa5 deploypkg: fix exit code 2023-05-03 23:45:58 +02:00
278a6d17a7 buildtree: fix exit codes 2023-05-03 17:50:19 +02:00
d068fa6b75 Merge pull request 'buildtree: don't strip arch maintainer' (#69) from Dudemanguy/artools:keep-original-maintainer into master
Reviewed-on: artix/artools#69
2023-05-03 17:47:01 +02:00
70e93c3843 buildtree: don't strip arch maintainer
Instead of completely overwriting the first maintainer line when doing
an import, copy it to the second line and then find/replace maintainer
with contributor.
2023-05-01 20:27:43 -05:00
2 changed files with 21 additions and 6 deletions

View File

@@ -114,8 +114,11 @@ set_maintainer() {
local name email path="$1"
name=$(git -C $path config --get user.name)
email=$(git -C $path config --get user.email)
firstline=$(head -n 1 "$path"/PKGBUILD)
sed "2i ${firstline}" -i "$path"/PKGBUILD
sed -e "1s|Maintainer:.*|Maintainer: $name <$email>|" \
-i "$path"/PKGBUILD
sed -e "2s|Maintainer|Contributor|" -i "$path"/PKGBUILD
}
patch_pkg(){
@@ -323,12 +326,22 @@ shift $(( OPTIND - 1 ))
set_arch_repos "$testing" "$staging" "$unstable"
${sync} && sync_repos
if ${sync}; then
sync_repos
fi
${view} && view_build
if ${view}; then
view_build
fi
${check} && check_tree
if ${check}; then
check_tree
fi
${import} && from_arch
if ${import}; then
from_arch
fi
${createnew} && pkgrepo_new
if ${createnew}; then
pkgrepo_new
fi

View File

@@ -42,7 +42,9 @@ repo_action(){
cd "$repo_path" || return
if [[ -n "${action}" ]]; then
repo-"${action}" -R "${dest_repo}"."${pkgdb_ext}" "${packages[@]}"
${linksdb} && links-"${action}" "${dest_repo}"."${linksdb_ext}" "${packages[@]}"
if ${linksdb}; then
links-"${action}" "${dest_repo}"."${linksdb_ext}" "${packages[@]}"
fi
fi
}