buildtree: view arch

bin/buildtree.in

@@ -142,7 +142,7 @@ from_arch(){
     msg "Package: %s" "$pkg"
     msg2 "Arch Version: %s" "$archver"
     [[ -n ${makedepends[@]} ]] && msg2 "makedepends: %s" "${makedepends[*]}"
-    [[ -n ${checkdepends[@]} ]] && msg2 "depends: %s" "${checkdepends[*]}"
+    [[ -n ${checkdepends[@]} ]] && msg2 "checkdepends: %s" "${checkdepends[*]}"
     [[ -n ${depends[@]} ]] && msg2 "depends: %s" "${depends[*]}"
 
     if [[ -d $dest ]];then
@@ -170,6 +170,27 @@ from_arch(){
     fi
 }
 
+view_build(){
+    local pkg="$1" src=
+    local git_tree_arch=$(find_tree "${tree_dir_arch}" "$pkg")
+    [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "$pkg"
+    src=${tree_dir_arch}/$git_tree_arch/$pkg/trunk
+
+    cd ${tree_dir_arch}/$git_tree_arch
+
+    source $src/PKGBUILD 2>/dev/null
+    [[ $arch == 'any' ]] && CARCH=any
+    local archver=$(get_full_version $pkg)
+
+    msg "Package: %s" "$pkg"
+    msg2 "Arch Version: %s" "$archver"
+    msg2 "arch: %s" "$CARCH"
+    [[ -n ${makedepends[@]} ]] && msg2 "makedepends: %s" "${makedepends[*]}"
+    [[ -n ${checkdepends[@]} ]] && msg2 "checkdepends: %s" "${checkdepends[*]}"
+    [[ -n ${depends[@]} ]] && msg2 "depends: %s" "${depends[*]}"
+    [[ -n ${optdepends[@]} ]] && msg2 "optdepends: %s" "${optdepends[@]}"
+}
+
 sync_repos(){
     ${sync_arch} && pull_tree_arch
     pull_tree_artix
@@ -190,6 +211,7 @@ display_settings(){
     msg2 "downgrades: %s" "${downgrades}"
     msg2 "artix: %s" "${artix}"
     msg2 "import: %s" "${import}"
+    msg2 "view: %s" "${view}"
 
     msg "PATHS:"
     msg2 "tree_dir_artix: %s" "${tree_dir_artix}"
@@ -210,6 +232,7 @@ upgrades=true
 downgrades=false
 artix=false
 import=false
+view=false
 package=''
 
 rsync_args=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
@@ -224,6 +247,7 @@ usage() {
     echo '    -d            Show downgrade packages'
     echo '    -a            Show artix specific packages'
     echo '    -i            Import a package from arch'
+    echo '    -v            View package depends'
     echo '    -q            Query settings'
     echo '    -h            This help'
     echo ''
@@ -233,7 +257,7 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:csudaizqh'
+opts='p:csudaizvqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
@@ -245,6 +269,7 @@ while getopts "${opts}" arg; do
         d) downgrades=true ;;
         a) artix=true ;;
         i) import=true ;;
+        v) view=true ;;
         q) pretend=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
@@ -260,6 +285,8 @@ ${pretend} && display_settings && exit 1
 
 ${sync} && sync_repos
 
+${view} && view_build "${package}"
+
 ${compare} && show_version_table
 
 ${artix} && show_artix_table

bin/commitpkg.in

@@ -71,8 +71,9 @@ symlink_commit_pkg(){
 
             [[ -d repos/$dest ]] && git rm -r repos/$dest
             [[ ! -d repos ]] && mkdir repos
+            [[ ! -d repos/$dest ]] && mkdir repos/$dest
 
-            cp -r trunk repos/$dest
+            cp trunk/* repos/$dest/
         else
             local action='move'
             local dest=${target_repo}-$CARCH

bin/mkchrootpkg.in

@@ -203,7 +203,7 @@ _chrootbuild() {
     ulimit -c 0
 
     # Work around chroot-run not giving a ctty
-    # exec </dev/console
+    exec </dev/console
 
     . /etc/profile
 

lib/util-pkg.sh

@@ -175,6 +175,18 @@ find_repo(){
         repo=multilib-staging-x86_64
     fi
 
+    if [[ -d $pkg/repos/gnome-unstable-x86_64 ]];then
+        repo=gnome-unstable-x86_64
+    elif [[ -d $pkg/repos/gnome-unstable-any ]];then
+        repo=gnome-unstable-any
+    fi
+
+    if [[ -d $pkg/repos/kde-unstable-x86_64 ]];then
+        repo=kde-unstable-x86_64
+    elif [[ -d $pkg/repos/kde-unstable-any ]];then
+        repo=kde-unstable-any
+    fi
+
     echo $repo
 }
 
@@ -191,6 +203,7 @@ arch_to_artix_repo(){
         multilib-staging-x86_64) repo=lib32-goblins ;;
         community-testing-*) repo=galaxy-gremlins ;;
         community-staging-*) repo=galaxy-goblins ;;
+        kde-unstable-*|gnome-unstable-*) repo=goblins ;;
     esac
     echo $repo
 }