small changes

Reviewed-on: artix/artools#69

bin/pkg/buildtree.in

@@ -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

bin/pkg/commitpkg.in

@@ -43,7 +43,9 @@ push_super() {
     msg "Update (%s)" "$name"
     git push origin master
     git prune
-    [[ "${cmd}" != 'commitpkg' ]] && check_team
+    if [[ "${cmd}" != 'commitpkg' ]]; then
+        check_team
+    fi
 }
 
 push_pkg() {

bin/pkg/deploypkg.in

@@ -23,6 +23,8 @@ add(){
     if pkgfile=$(find_cached_pkgfile "${pkgname}"); then
         msg "Found: %s" "${pkgfile}"
         packages+=("${pkgname}")
+        dbargs+=("${packages[@]}")
+        linksargs+=("${packages[@]}")
         action='add'
         ln -sfv "${pkgfile}"{,.sig} "$repo_path"/
     fi
@@ -36,13 +38,17 @@ remove(){
 
 repo_action(){
     local packages=() action func="$1"
+    local dbargs=( -R "${dest_repo}.${pkgdb_ext}")
+    local linksargs=("${dest_repo}.${linksdb_ext}" )
     for pkgname in "${passfiles[@]}"; do
         "$func"
     done
     cd "$repo_path" || return
     if [[ -n "${action}" ]]; then
-        repo-"${action}" -R "${dest_repo}"."${pkgdb_ext}" "${packages[@]}"
-        ${linksdb} && links-"${action}" "${dest_repo}"."${linksdb_ext}" "${packages[@]}"
+        repo-"${action}" "${dbargs[@]}"
+        if ${linksdb}; then
+            links-"${action}" "${linksargs[@]}"
+        fi
     fi
 }
 

data/pacman/pacman-docker.conf

@@ -1,99 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-NoExtract  = usr/share/help/* !usr/share/help/en*
-NoExtract  = usr/share/gtk-doc/html/* usr/share/doc/*
-NoExtract  = usr/share/locale/* usr/share/X11/locale/* usr/share/i18n/*
-NoExtract   = !*locale*/en*/* !usr/share/i18n/charmaps/UTF-8.gz !usr/share/*locale*/locale.*
-NoExtract   = !usr/share/*locales/en_?? !usr/share/*locales/i18n* !usr/share/*locales/iso*
-NoExtract   = !usr/share/*locales/trans*
-NoExtract  = usr/share/man/* usr/share/info/*
-NoExtract  = usr/share/vim/vim*/lang/*
-
-# Misc options
-#UseSyslog
-#Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Artix Linux
-# packagers with `pacman-key --populate artix`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The gremlins repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[system]
-Include = /etc/pacman.d/mirrorlist
-
-[world]
-Include = /etc/pacman.d/mirrorlist
-
-[galaxy]
-Include = /etc/pacman.d/mirrorlist
-
-# If you want to run 32 bit applications on your x86_64 system,
-# enable the lib32 repositories as required here.
-
-#[lib32]
-#Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs

lib/pkg/common.sh

@@ -16,7 +16,7 @@ get_pkg_org(){
     case ${pkg} in
         ruby-*) org="packagesRuby" ;;
         perl-*) org="packagesPerl" ;;
-        python-*|python2-*) org="packagesPython" ;;
+        python-*) org="packagesPython" ;;
         *) sub=${pkg:0:1}; org="packages${sub^^}" ;;
     esac
     printf "%s\n" "$org"