Merge pull request #49 from artix-linux/devel

Devel

bin/buildtree.in

@@ -19,24 +19,6 @@ DATADIR='@datadir@'
 import ${LIBDIR}/util.sh
 import ${LIBDIR}/util-pkg.sh
 
-pull_tree(){
-    local branch="master" tree="$1"
-    local local_head=$(get_local_head "$branch")
-    local remote_head=$(get_remote_head "$branch")
-    local timer=$(get_timer)
-    msg "Checking [%s] ..." "$tree"
-    msg2 "local: %s" "${local_head}"
-    msg2 "remote: %s" "${remote_head}"
-    if [[ "${local_head}" == "${remote_head}" ]]; then
-        info "nothing to do"
-    else
-        info "needs pull"
-        git pull origin $branch
-    fi
-    msg "Done [%s]" "$tree"
-    show_elapsed_time "${FUNCNAME}" "${timer}"
-}
-
 clone_tree(){
     local timer=$(get_timer) tree="$1" host_tree="$2"
     msg "Preparing [%s] ..." "$tree"

bin/chroot-run.in

@@ -92,6 +92,7 @@ copy_hostconf () {
 
 chroot_extra_mount() {
     chroot_mount "/etc/resolv.conf" "$1/etc/resolv.conf" -B
+    chroot_mount "/etc/hosts" "$1/etc/hosts" -B
     chroot_mount_conditional "[[ -e $1/etc/machine-id ]]" "/etc/machine-id" "$1/etc/machine-id" -B
     chroot_mount "${cache_dirs[0]}" "$1${cache_dirs[0]}" -B
 

bin/commitpkg.in

@@ -17,35 +17,42 @@ DATADIR='@datadir@'
 
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
 import ${LIBDIR}/util.sh
+import ${LIBDIR}/util-pkg.sh
 
 commit_pkg(){
-    cd ${tree_dir_artix}/${git_tree}/${package}
+    local git_tree=$(find_tree "${tree_dir_artix}" "${package}")
-    source trunk/PKGBUILD
+    if [[ -n ${git_tree} ]];then
-    local ver=$(get_full_version ${package})
+        cd ${tree_dir_artix}/${git_tree}/${package}
-    if ${remove};then
+        source trunk/PKGBUILD
-        local action='remove'
+        local ver=$(get_full_version ${package})
-        local pkg=${package}-$ver
+        if ${remove};then
-        if [[ "${source_repo}" == 'trunk' ]];then
+            local action='remove'
-            pkg=${package}
+            local pkg=${package}-$ver
-            info "[%s] '%s' %s" "${source_repo}" "$pkg" "${action}"
+            if [[ "${source_repo}" == 'trunk' ]];then
-            git rm -r trunk
+                pkg=${package}
+                info "[%s] '%s' %s" "${source_repo}" "$pkg" "${action}"
+                git rm -r trunk
+            else
+                info "[%s] '%s' %s" "${source_repo}" "$pkg" "${action}"
+                git rm -r repos/${source_repo}-$CARCH
+            fi
+            git commit -m "[${source_repo}] '$pkg' ${action}"
+            ${push} && push_tree "${git_tree}"
         else
-            info "[%s] '%s' %s" "${source_repo}" "$pkg" "${action}"
+            local action='modify'
-            git rm -r repos/${source_repo}-$CARCH
+            info "[%s] '%s' %s" "${source_repo}" "${package}-$ver" "${action}"
+            git add .
+            git commit -m "[${source_repo}] '${package}-$ver' ${action}"
+            ${push} && push_tree "${git_tree}"
         fi
-        git commit -m "[${source_repo}] '$pkg' ${action}"
-        ${push} && git push origin master
     else
-        local action='modify'
+        error "Package '%s' does not exist!" "${package}"
-        info "[%s] '%s' %s" "${source_repo}" "${package}-$ver" "${action}"
-        git add .
-        git commit -m "[${source_repo}] '${package}-$ver' ${action}"
-        ${push} && git push origin master
     fi
 }
 
 release_pkg(){
-    if [[ -d ${tree_dir_artix}/${git_tree}/${package} ]];then
+    local git_tree=$(find_tree "${tree_dir_artix}" "${package}")
+    if [[ -n ${git_tree} ]];then
         cd ${tree_dir_artix}/${git_tree}/${package}
         source trunk/PKGBUILD
         [[ $arch == 'any' ]] && CARCH=any
@@ -69,7 +76,9 @@ release_pkg(){
         info "[%s] -> [%s] '%s' %s" "${source_repo}" "${target_repo}" "${package}-$ver" "${action}"
         git add .
         git commit -m "[${source_repo}] -> [${target_repo}] '${package}-$ver' ${action}"
-        ${push} && git push origin master
+        ${push} && push_tree "${git_tree}"
+    else
+        error "Package '%s' does not exist!" "${package}"
     fi
 }
 
@@ -78,7 +87,6 @@ display_settings(){
     show_config
 
     msg "OPTIONS:"
-    msg2 "git_tree: %s" "${git_tree}"
     msg2 "source_repo: %s" "${source_repo}"
     msg2 "target_repo: %s" "${target_repo}"
     msg2 "package: %s" "${package}"
@@ -100,15 +108,9 @@ remove=false
 push=false
 pretend=false
 
-git_tree='packages'
-
 cmd=${0##*/}
 target_repo=${cmd%pkg}
 
-case ${target_repo} in
-    community*|multilib*) git_tree='packages-galaxy' ;;
-esac
-
 usage() {
     echo "Usage: ${0##*/} [options]"
     echo "    -s <name>          Source repository [default:${source_repo}]"
@@ -142,8 +144,12 @@ shift $(($OPTIND - 1))
 
 ${pretend} && display_settings && exit 1
 
-if [[ "${cmd}" == 'commitpkg' ]];then
+if $(is_valid_repo "${source_repo}");then
-    commit_pkg
+    if [[ "${cmd}" == 'commitpkg' ]];then
+        commit_pkg
+    else
+        release_pkg
+    fi
 else
-    release_pkg
+    error "source repository '%s' is not valid!" "${source_repo}"
 fi

bin/deploypkg.in

@@ -29,7 +29,8 @@ del_from_repo(){
         if pkgfile=$(find_cached_package "$name" "$ver" "$CARCH");then
             info "pkgfile: %s" "${pkgfile##*/}"
             repo-remove -R $repo_path/$repo.db.tar.xz $name
-            [[ -f $repo_path/${pkgfile##*/}{,.sig} ]] && rm -v $repo_path/${pkgfile##*/}{,.sig}
+            [[ -e $repo_path/${pkgfile##*/} ]] && rm -v $repo_path/${pkgfile##*/}
+            [[ -e $repo_path/${pkgfile##*/}.sig ]] && rm -v $repo_path/${pkgfile##*/}.sig
         fi
     done
 }

data/missing

@@ -18,3 +18,8 @@ extra/python-packaging
 extra/python-pyparsing
 extra/ttf-liberation
 extra/appstream-glib
+extra/libxkbui
+extra/libxkbfile
+extra/libunicodenames
+extra/mpg123
+extra/opencl-headers

data/qt5.list

@@ -28,18 +28,11 @@ qt5-remoteobjects
 qt5-webchannel
 qt5-websockets
 qt5-webglplugin
-
-
 qt5-tools
 qt5-translations
 qt5-doc
 qt5-examples
-
 qt5-webengine
 qt5-webview
-
 qt5-webkit
-
+pyqt5
-python2-pyqt5
-python-pyqt5
-pyqt5-common

lib/util-pkg.sh

@@ -71,6 +71,35 @@ patch_pkg(){
     esac
 }
 
+find_tree(){
+    local tree="$1" pkg="$2"
+    local result=$(find $tree -mindepth 2 -maxdepth 2 -type d -name "$pkg")
+    result=${result%/*}
+    echo ${result##*/}
+}
+
+pull_tree(){
+    local branch="master" tree="$1"
+    local local_head=$(get_local_head "$branch")
+    local remote_head=$(get_remote_head "$branch")
+    local timer=$(get_timer)
+    msg "Checking [%s] ..." "$tree"
+    if [[ "${local_head}" == "${remote_head}" ]]; then
+        msg2 "nothing to do"
+    else
+        msg2 "needs pull"
+        git pull origin $branch
+    fi
+    msg "Done [%s]" "$tree"
+    show_elapsed_time "${FUNCNAME}" "${timer}"
+}
+
+push_tree(){
+    local branch="master" tree="$1"
+    pull_tree "$tree"
+    git push origin "$branch"
+}
+
 get_import_path(){
     local tree="$1" import_path=
     case $tree in
@@ -80,6 +109,14 @@ get_import_path(){
     echo $import_path
 }
 
+is_valid_repo(){
+    local src="$1"
+    case $src in
+        core|extra|community|multilib|testing|staging|community-testing|community-staging|multilib-testing|multilib-staging|trunk) return 0 ;;
+        *) return 1 ;;
+    esac
+}
+
 find_repo(){
     local pkg="$1" repo=