commitpkg: prevent trunk dir copy in certain cases

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
 }