buildtree: get proper pkgbuild group

deployiso: set new server home path

README.md

@@ -28,6 +28,7 @@ artools
 - pkg:
   * namcap
   * git-subrepo
+  * jshon
 
 - iso:
   * dosfstools

bin/pkg/buildtree.in

@@ -20,10 +20,10 @@ pull_tree_arch(){
     for tree in ${TREE_NAMES_ARCH[@]};do
         if [[ -d ${tree} ]];then
             cd ${tree}
-            pull_tree "${tree}"
+            pull_tree "${tree}" "$(get_local_head)" "Arch"
             cd ..
         else
-            clone_tree "${HOST_TREE_ARCH}" "${tree}"
+            clone_tree "${HOST_TREE_ARCH}" "${tree}" "Arch"
         fi
     done
 }
@@ -34,7 +34,7 @@ pull_tree_artix(){
         if [[ -d ${tree} ]];then
             config_tree "${tree}"
             cd ${tree}
-            pull_tree "${tree}"
+            pull_tree "${tree}" "$(get_local_head)"
             cd ..
         else
             clone_tree "${HOST_TREE_ARTIX}" "${tree}"
@@ -59,7 +59,7 @@ show_deps(){
 
     local archver=$(get_full_version $pkg)
 
-    msg "repo: %s" "$repo"
+    msg2 "repo: %s" "$repo"
     [[ -n ${pkgbase} ]] && msg2 "pkgbase: %s" "${pkgbase}"
     msg2 "pkgname: %s" "${pkgname[*]}"
     [[ -n $pkgdesc ]] && msg2 "pkgdesc: %s" "${pkgdesc}"
@@ -87,6 +87,7 @@ from_arch(){
 
     dest=${TREE_DIR_ARTIX}/$tree_dir/$pkg/trunk
 
+    msg "tree: %s" "$tree_dir"
     show_deps "$src" "$repo"
 
     if [[ -d $dest ]];then
@@ -122,7 +123,7 @@ view_build(){
 
 sync_repos(){
     ${sync_arch} && pull_tree_arch
-    pull_tree_artix
+    ${sync_artix} && pull_tree_artix
 }
 
 load_user_info
@@ -133,6 +134,7 @@ load_vars /etc/makepkg.conf
 
 sync=false
 sync_arch=true
+sync_artix=true
 import=false
 view=false
 createnew=false
@@ -140,20 +142,21 @@ conf=false
 
 PACKAGE=''
 
-TEAM=${TREE_NAMES[0]}
+TEAM=${TREE_NAMES_ARTIX[0]}
-SUBORG=''
+GROUP=${TREE_NAMES_ARTIX[0]}
 
 usage() {
     echo "Usage: ${0##*/} [options]"
     echo '    -p <pkg>      Package name'
     echo '    -t <team>     Team name (only with -n)'
     echo "                  [default: ${TEAM}]"
-    echo '    -o <org>      Org of subrepo (only with -c)'
+    echo '    -g <group>    Group name, the superrepo (only with -n)'
+    echo "                  [default: ${GROUP}]"
     echo "    -s            Clone or pull repos"
     echo "    -z            Don't clone or pull arch repos"
+    echo "    -y            Don't clone or pull artix repos"
     echo '    -i            Import a package from arch repos'
     echo '    -n            Make new remote subrepo and clone it'
-    echo '    -c            Configure subrepo url'
     echo '    -v            View package depends'
     echo '    -h            This help'
     echo ''
@@ -163,19 +166,19 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:t:o:csinzvh'
+opts='p:t:g:sinzyvh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
         p) PACKAGE="$OPTARG" ;;
         t) TEAM="$OPTARG" ;;
-        o) SUBORG="$OPTARG" ;;
+        g) GROUP="$OPTARG" ;;
         s) sync=true ;;
         z) sync_arch=false ;;
+        y) sync_artix=false ;;
         i) import=true ;;
         n) createnew=true ;;
         v) view=true ;;
-        c) conf=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
@@ -192,6 +195,4 @@ ${view} && view_build "${PACKAGE}"
 
 ${import} && from_arch "${PACKAGE}"
 
-${createnew} && subrepo_new "${PACKAGE}" "${TEAM}"
+${createnew} && subrepo_new "${PACKAGE}" "${GROUP}" "${TEAM}"
-
-${conf} && subrepo_config "${PACKAGE}" "${SUBORG}"

bin/pkg/deploypkg.in

@@ -21,7 +21,13 @@ update_repo(){
 
     . PKGBUILD
 
-    for name in ${pkgname[@]};do
+    local pkgsearch=(${pkgname[@]})
+    if check_option "debug" "y"; then
+        pkgbase=${pkgbase:-${pkgname[@]}}
+        pkgsearch+=("${pkgbase}-debug")
+    fi
+
+    for name in ${pkgsearch[@]}; do
         pkgarch=$(get_pkg_arch "$name")
         ver=$(get_full_version "$name")
         if pkgfile=$(find_cached_package "$name" "$ver" "$pkgarch");then

bin/pkg/mkchrootpkg.in

@@ -385,9 +385,11 @@ main() {
         sync_chroot "$chrootdir/root" "$copydir" "$copy"
     fi
 
+    bindmounts_rw+=("${PWD}:/startdir" "${SRCDEST}:/srcdest")
+
     $update_first && chroot-run \
-            -r "${bindmounts_ro[@]}" \
+            -r "${bindmounts_ro[*]}" \
-            -w "${bindmounts_rw[@]}" \
+            -w "${bindmounts_rw[*]}" \
             "$copydir" \
             pacman -Syu --noconfirm
 
@@ -407,8 +409,6 @@ main() {
 
     prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir" "$run_namcap"
 
-    bindmounts_rw+=("${PWD}:/startdir" "${SRCDEST}:/srcdest")
-
     if chroot-run \
         -r "${bindmounts_ro[*]}" \
         -w "${bindmounts_rw[*]}" \

bin/pkg/pkg2yaml.in

@@ -79,14 +79,15 @@ write_details() {
 }
 
 write_pkg_yaml(){
-    local pkgfile=$(print_all_package_names)
 
     Yaml=$(write_yaml_header)
 
     Yaml+=$(write_empty_line)
 
+    pkgbase=${pkgbase:-${pkgname[0]}}
+
     Yaml+=$(write_yaml_map 0 "pkgbase")
-    Yaml+=$(write_yaml_map 2 "pkgname" "${pkgbase:-$pkgname}")
+    Yaml+=$(write_yaml_map 2 "pkgname" "${pkgbase}")
     ${details} && write_details ''
 
     Yaml+=$(write_empty_line)
@@ -99,6 +100,8 @@ write_pkg_yaml(){
 
     Yaml+=$(write_empty_line)
 
+    local pkgfile=$(print_all_package_names)
+
     Yaml+=$(write_yaml_map 0 "pkgfile")
     for f in ${pkgfile[@]};do
         Yaml+=$(write_yaml_seq 2 "${f##*/}")
@@ -136,4 +139,6 @@ PACKAGE="$1"/PKGBUILD; shift
 
 . "$PACKAGE"
 
+. /etc/makepkg.conf
+
 write_pkg_yaml

data/artools.conf

@@ -17,8 +17,27 @@
 
 # HOST_TREE_ARTIX='gitea@gitea.artixlinux.org:artix'
 
+# TREE_DIR_ARTIX=${WORKSPACE_DIR}/artixlinux
+
+# TREE_NAMES_ARTIX=(
+#         packages
+#         community
+#         packages-kernel
+#         packages-openrc
+#         packages-runit
+#         packages-xorg
+#         packages-python
+#         packages-perl
+#         packages-qt5
+#         packages-ruby
+# )
+
 # HOST_TREE_ARCH=git://git.archlinux.org/svntogit
 
+# TREE_DIR_ARCH=${WORKSPACE_DIR}/archlinux
+
+# TREE_NAMES_ARCH=(packages community)
+
 # default repos root
 # REPOS_ROOT=${WORKSPACE_DIR}/repos
 

data/pkg/makepkg.conf

@@ -1,4 +1,6 @@
 #!/hint/bash
+# shellcheck disable=2034
+
 #
 # /etc/makepkg.conf
 #
@@ -37,8 +39,8 @@ CHOST="x86_64-pc-linux-gnu"
 
 #-- Compiler and Linker Flags
 CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
-CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
+CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
@@ -143,3 +145,5 @@ COMPRESSZ=(compress -c -f)
 #
 PKGEXT='.pkg.tar.xz'
 SRCEXT='.src.tar.gz'
+
+# vim: set ft=sh ts=2 sw=2 et:

data/pkglists/kernel.list

@@ -1,5 +1,6 @@
 linux
 nvidia
+nvidia-utils
 acpi_call
 bbswitch
 broadcom-wl

data/pkglists/lxqt.list

@@ -0,0 +1,31 @@
+lxqt-about
+lxqt-admin
+lxqt-config
+lxqt-globalkeys
+lxqt-notificationd
+lxqt-openssh-askpass
+lxqt-panel
+lxqt-policykit
+lxqt-powermanagement
+lxqt-qtplugin
+lxqt-runner
+lxqt-session
+lxqt-sudo
+lxqt-themes
+lxqt-build-tools
+
+compton-conf
+lximage-qt
+obconf-qt
+openbox
+pcmanfm-qt
+qterminal
+liblxqt
+libqtxdg
+lxmenu-data
+libfm-qt
+libfm
+qtermwidget
+libsysstat
+libstatgrab
+qps

lib/base/message.sh

@@ -117,10 +117,11 @@ msg_row_notify(){
 
 msg_row(){
     local mesg=$1; shift
-    printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
+#     printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
+    printf "${WHITE} ${mesg}${ALL_OFF}\n" "$@" >&2
 }
 
 msg_row_upgrade(){
     local mesg=$1; shift
-    printf "${RED}${RED} ${mesg} ${ALL_OFF}\n" "$@" >&2
+    printf "${RED} ${mesg} ${ALL_OFF}\n" "$@" >&2
 }

lib/iso/profile.sh

@@ -63,7 +63,7 @@ load_profile(){
 
     PASSWORD=${PASSWORD:-'artix'}
 
-    ADDGROUPS=${ADDGROUPS:-"video,power,cdrom,network,lp,scanner,wheel,users,log"}
+    ADDGROUPS=${ADDGROUPS:-"video,power,optical,network,lp,scanner,wheel,users,log"}
 
     if [[ -z ${SERVICES[@]} ]];then
         SERVICES=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'NetworkManager')

lib/pkg/gitea.sh

@@ -23,6 +23,8 @@ create_repo(){
         -H "accept: application/json" \
         -H "content-type: application/json" \
         -d "$json"
+
+    echo
 }
 
 delete_repo(){

lib/pkg/subrepo.sh

@@ -39,14 +39,6 @@ subrepo_push(){
     git subrepo push "$pkg"
 }
 
-subrepo_config(){
-    local pkg="$1" org="$2"
-    local gitname=$(get_compliant_name "$pkg")
-    local url=gitea@"${GIT_DOMAIN}":"$org"/"$gitname".git
-    msg2 "Update .gitrepo (%s) [%s]" "$pkg" "$url"
-    git subrepo config "$pkg" remote "$url"
-}
-
 subrepo_clean(){
     local pkg="$1"
     msg2 "Clean (%s)" "$pkg"
@@ -67,9 +59,9 @@ subrepo_clone(){
 }
 
 clone_tree(){
-    local timer=$(get_timer) url="$1" tree="$2"
+    local timer=$(get_timer) url="$1" tree="$2" os="${3:-$(get_osname)}"
 
-    msg "Cloning (%s) ..." "$tree"
+    msg "Cloning %s (%s) ..." "$tree" "$os"
 
     git clone $url/$tree.git
     show_elapsed_time "${FUNCNAME}" "${timer}"
@@ -87,11 +79,10 @@ has_changes(){
 }
 
 pull_tree(){
-    local tree="$1"
+    local tree="$1" local_head="$2" os="${3:-$(get_osname)}"
-    local local_head=${2:-$(get_local_head)}
     local remote_head=$(get_remote_head)
 
-    msg "Checking (%s)" "${tree}"
+    msg "Checking %s (%s)" "${tree}" "$os"
     if $(has_changes "${local_head}" "${remote_head}");then
         git pull origin master
     fi

lib/pkg/util.sh

@@ -98,14 +98,14 @@ get_cases(){
 
     local cases=
     for p in ${pkgs[@]};do
-        cases=${p:+}${p:-|}${p}
+        cases=${cases:-}${cases:+|}${p}
     done
     echo $cases
 }
 
 get_artix_tree(){
     local pkg="$1" artix_tree="${2:-$3}" tree
-    case $pkg in
+    eval "case $pkg in
         $(get_cases kernel)) tree=packages-kernel ;;
         python-*|python2-*) tree=packages-python ;;
         perl-*) tree=packages-perl ;;
@@ -114,12 +114,15 @@ get_artix_tree(){
         *-openrc) tree=packages-openrc ;;
         *-runit) tree=packages-runit ;;
         qt5-*) tree=packages-qt5 ;;
+        lxqt*|$(get_cases lxqt)) tree=packages-lxqt ;;
+        *) tree=$artix_tree
+    esac"
+    echo $tree
+
 #         $(get_cases freedesktop)) tree=packages-desktop ;;
 #         $(get_cases kde)) tree=packages-kde ;;
 #         $(get_cases gnome)) tree=packages-gnome ;;
-        *) tree=$artix_tree
+    
-    esac
-    echo $tree
 }
 
 get_import_path(){