add media list

Makefile

@@ -1,4 +1,4 @@
-VERSION=0.13
+VERSION=0.14
 
 CHROOT_VERSION=0.9
 
@@ -85,9 +85,6 @@ LN_DEPLOYPKG = \
 PKG_LIBS = \
 	$(wildcard lib/pkg/*)
 
-PKG_LISTS = \
-	$(wildcard data/pkglists/*.list)
-
 PKG_UTIL = lib/util-pkg.sh
 
 PKG_DATA = \
@@ -183,8 +180,6 @@ install_pkg:
 	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches
 	install $(FILEMODE) $(PATCHES) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches
 
-	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/pkglists
-	install $(FILEMODE) $(PKG_LISTS) $(DESTDIR)$(DATADIR)/$(TOOLS)/pkglists
 install_cpio:
 	+make CPIODIR=$(CPIODIR) DESTDIR=$(DESTDIR) -C initcpio install
 

bin/pkg/buildtree.in

@@ -78,7 +78,7 @@ from_arch(){
     [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "$pkg"
 
     local package=${TREE_DIR_ARCH}/$git_tree_arch/$pkg
-    local repo=$(find_repo "$package")
+    local repo=$(find_repo "$package" "${staging}" "${unstable}")
 
     src=$package/repos/$repo
 
@@ -114,7 +114,7 @@ view_build(){
     [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "$pkg"
 
     local pkg_path=${TREE_DIR_ARCH}/$git_tree_arch/$pkg
-    local repo=$(find_repo "$pkg_path")
+    local repo=$(find_repo "$pkg_path" "${staging}" "${unstable}")
 
     src=$pkg_path/repos/$repo
 
@@ -139,6 +139,8 @@ import=false
 view=false
 createnew=false
 conf=false
+unstable=false
+staging=true
 
 PACKAGE=''
 
@@ -157,6 +159,8 @@ usage() {
     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 '    -u            Include kde & gnome unstable (only with -i)'
+    echo '    -w            Exclude staging (only with -i)'
     echo '    -v            View package depends'
     echo '    -h            This help'
     echo ''
@@ -166,7 +170,7 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:t:g:sinzyvh'
+opts='p:t:g:uwsinzyvh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
@@ -178,6 +182,8 @@ while getopts "${opts}" arg; do
         y) sync_artix=false ;;
         i) import=true ;;
         n) createnew=true ;;
+        w) staging=false ;;
+        u) unstable=true ;;
         v) view=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;

bin/pkg/commitpkg.in

@@ -15,6 +15,22 @@
 . @libdir@/artools/util-base.sh
 . @libdir@/artools/util-pkg.sh
 
+get_path(){
+    local repo="$1" pkg=trunk/PKGBUILD
+    if [[ $repo != trunk ]]; then
+        [[ -f repos/$repo-${ARCH}/PKGBUILD ]] && pkg=repos/$repo-${ARCH}/PKGBUILD
+        [[ -f repos/$repo-any/PKGBUILD ]] && pkg=repos/$repo-any/PKGBUILD
+    fi
+    echo $pkg
+}
+
+prepare_commit(){
+    local dest="$1"
+    [[ -d repos/$dest ]] && git rm -r repos/$dest
+    [[ ! -d repos ]] && mkdir repos
+    [[ ! -d repos/$dest ]] && mkdir repos/$dest
+}
+
 commit_pkg(){
     local git_tree=$(find_tree "${TREE_DIR_ARTIX}" "${PACKAGE}")
     if [[ -n ${git_tree} ]];then
@@ -25,9 +41,13 @@ commit_pkg(){
 
         cd ${TREE_DIR_ARTIX}/${git_tree}/${PACKAGE}
 
-        . trunk/PKGBUILD
+        local pkgbuild=$(get_path "${REPO_SRC}")
+
+        . $pkgbuild
         [[ $arch == 'any' ]] && CARCH=any
-        local ver=$(get_full_version "${PACKAGE}")
+
+        local version=$(get_full_version)
+
         local commit_msg=""
 
         if ${remove};then
@@ -36,14 +56,14 @@ commit_pkg(){
                 local pkg=${PACKAGE}
                 git rm -r trunk
             else
-                local pkg="${PACKAGE}-$ver"
+                local pkg="${PACKAGE}-$version"
                 git rm -r repos/"${REPO_SRC}-$CARCH"
             fi
             commit_msg="[${REPO_SRC}] '$pkg' ${action}"
             msg "Action: %s" "$commit_msg"
         else
             local action='modify'
-            commit_msg="[${REPO_SRC}] '${PACKAGE}-$ver' ${action}"
+            commit_msg="[${REPO_SRC}] '${PACKAGE}-$version' ${action}"
             msg "Action: %s" "$commit_msg"
             git add .
 
@@ -76,17 +96,18 @@ symlink_commit_pkg(){
 
         cd ${TREE_DIR_ARTIX}/${git_tree}/${PACKAGE}
 
-        . trunk/PKGBUILD
+        local pkgbuild=$(get_path "${REPO_SRC}")
+
+        . $pkgbuild
         [[ $arch == 'any' ]] && CARCH=any
-        local ver=$(get_full_version "${PACKAGE}")
+
+        local version=$(get_full_version)
 
         if [[ ${REPO_SRC} == 'trunk' ]];then
             local action='add'
             local dest="${REPO_DEST}-$CARCH"
 
-            [[ -d repos/$dest ]] && git rm -r repos/$dest
+            prepare_commit "$dest"
-            [[ ! -d repos ]] && mkdir repos
-            [[ ! -d repos/$dest ]] && mkdir repos/$dest
 
             cp trunk/* repos/$dest/
         else
@@ -94,14 +115,12 @@ symlink_commit_pkg(){
             local src="${REPO_SRC}-$CARCH" dest="${REPO_DEST}-$CARCH"
 
             [[ ! -f repos/$src/PKGBUILD ]] && die "%s does not exist!" "repos/$src/PKGBUILD"
-            [[ -d repos/$dest ]] && git rm -r repos/$dest
+            prepare_commit "$dest"
-            [[ ! -d repos ]] && mkdir repos
-            [[ ! -d repos/$dest ]] && mkdir repos/$dest
 
             cp repos/$src/* repos/$dest/
             git rm -r repos/$src
         fi
-        local commit_msg="[${REPO_SRC}] -> [${REPO_DEST}] '${PACKAGE}-$ver' ${action}"
+        local commit_msg="[${REPO_SRC}] -> [${REPO_DEST}] '${PACKAGE}-$version' ${action}"
         msg "Action: %s" "$commit_msg"
 
         git add .

bin/pkg/comparepkg.in

@@ -16,7 +16,7 @@
 . @libdir@/artools/util-pkg.sh
 
 compare(){
-    local pkgpath="$1"
+    local pkgpath="$1" group="$2"
     local pkg=${pkgpath##*/}
     local artixrepo=$(find_repo "$package" "${staging}" "${unstable}")
     local artixshow=${artixrepo%-*}
@@ -50,9 +50,9 @@ compare(){
                 case $artixrepo in
                     *testing*|*staging*)
                         if $repomatch;then
-                            msg_row "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
+                            msg_row "${table}" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver" "$group"
                         else
-                            msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
+                            msg_row_notify "${table}" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver" "$group"
                         fi
                     ;;
                 esac
@@ -61,14 +61,14 @@ compare(){
         elif ${upgrades};then
 
             if [ $result -eq -1 ];then
-                msg_row_upgrade "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
+                msg_row_upgrade "${table}" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver" "$group"
             fi
 
         elif ${downgrades};then
 
             if [ $result -eq 1 ];then
                 if [[ -n $archver ]] && [[ -n $archrepo ]];then
-                    msg_row_downgrade "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
+                    msg_row_downgrade "${table}" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver" "$group"
                 fi
             fi
 
@@ -110,7 +110,7 @@ check_db(){
                         is_entry=true
                     fi
                     if ! $is_entry; then
-                        msg_row "%-20s %-35s %-20s %-10s" "$repo" "$name" "$artixver" "$is_entry"
+                        msg_row "${table2}" "$repo" "$name" "$artixver" "$is_entry"
                     fi
                 done
                 unset artixver is_entry pkgbuild pkgver epoch pkgname pkgbase
@@ -133,7 +133,7 @@ update_db_cache(){
 }
 
 query_db() {
-    msg_table_header "%-20s %-45s %s" "Repo" "Package" "Library"
+    msg_table_header "${table3}" "Repo" "Package" "Library"
     for repo in "${searchrepos[@]}"; do
         local prefix=
         local db=${USERCACHEDIR}/${LINKSDBEXT}/${ARCH}/${repo}/
@@ -143,7 +143,7 @@ query_db() {
                 pkg=${pkg#${db}}
                 pkg="${pkg%/*}"
 
-                msg_row "%-20s %-45s %s" "${repo}" "${pkg}" "${match}"
+                msg_row "${table3}" "${repo}" "${pkg}" "${match}"
             done < <(grep -rZ "${library}" "${db}") | sort -u
         fi
     done
@@ -154,12 +154,12 @@ show_version_table(){
 
     if ${check};then
         ${sync} && update_db_cache
-        msg_table_header "%-20s %-35s %-20s %-10s" "Repo" "Package" "Version" "Database"
+        msg_table_header "${table2}" "Repo" "Package" "Version" "Database"
     elif ${query};then
         ${sync} && update_db_cache
         query_db
     else
-        msg_table_header "%-20s %-20s %-25s %-30s %-30s" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version"
+        msg_table_header "${table}" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version" "Group"
     fi
 
     for tree in ${TREE_NAMES_ARTIX[@]};do
@@ -170,7 +170,7 @@ show_version_table(){
             if ${check};then
                 check_db "$package"
             else
-                compare "$package"
+                compare "$package" "$tree"
             fi
         done
     done
@@ -198,6 +198,10 @@ artix_repos=(
     'gnome-wobble' 'kde-wobble'
 )
 
+readonly table="%-20s %-20s %-25s %-25s %-25s %-20s"
+readonly table2="%-20s %-35s %-20s %-10s"
+readonly table3="%-20s %-45s %s"
+
 searchrepos=(${artix_repos[@]})
 
 usage() {

data/artools.conf

@@ -25,11 +25,19 @@
 #         packages-kernel
 #         packages-openrc
 #         packages-runit
+#         packages-media
 #         packages-xorg
 #         packages-python
 #         packages-perl
 #         packages-qt5
+#         packages-devel
 #         packages-ruby
+#         packages-gtk
+#         packages-gnome
+#         packages-cinnamon
+#         packages-lxqt
+#         packages-mate
+#         packages-kde
 # )
 
 # HOST_TREE_ARCH=git://git.archlinux.org/svntogit

data/pkglists/freedesktop.list

@@ -1,63 +0,0 @@
-accountsservice
-cairo
-colord
-cppunit
-dbus
-dbus-glib
-dbus-python
-desktop-file-utils
-fontconfig
-geoclue2
-glu
-gst-plugins-bad
-gst-plugins-base
-gst-plugins-good
-gst-plugins-ugly
-gstreamer
-harfbuzz
-hicolor-icon-theme
-libatasmart
-libbsd
-libdrm
-libevdev
-libinput
-libmbim
-libnice
-libqmi
-libvdpau
-libxcb
-libxft
-libxi
-media-player-info
-mesa
-modemmanager
-networkmanager
-orc
-p11-kit
-polkit
-poppler
-poppler-data
-pulseaudio
-pyxdg
-r
-sdl
-shared-mime-info
-sound-theme-freedesktop
-startup-notification
-systemdcompat
-telepathy-glib
-ttf-dejavu
-udisks2
-upower
-wayland
-wayland-protocols
-webrtc-audio-processing
-xcb-proto
-xcb-util
-xcb-util-cursor
-xcb-util-image
-xcb-util-keysyms
-xcb-util-renderutil
-xcb-util-wm
-xdg-user-dirs
-xdg-utils

data/pkglists/gnome.list

@@ -1,63 +0,0 @@
-adwaita-icon-theme
-atk
-at-spi2-atk
-at-spi2-core
-babl
-cantarell-fonts
-cogl
-dconf
-flatpak
-gamin
-gcab
-gconf
-gcr
-gdk-pixbuf2
-gegl02
-git
-glade
-glib2
-glib-networking
-gnome-common
-gnome-keyring
-gobject-introspection
-gsettings-desktop-schemas
-gssdp
-gtk2
-gtk3
-gtk-doc
-gtksourceview3
-gupnp
-gupnp-igd
-gvfs
-json-glib
-libcloudproviders
-libcroco
-libgee
-libglade
-libgnome-keyring
-libgudev
-libnotify
-librsvg
-libsecret
-libsoup
-libxml2
-libxslt
-meld
-mobile-broadband-provider-info
-modemmanager
-networkmanager
-network-manager-applet
-orca
-ostree
-pango
-pyatspi
-pygobject
-pygobject2
-pygtk
-rest
-ttf-bitstream-vera
-vala
-vte
-vte3
-yelp-tools
-yelp-xsl

data/pkglists/kde.list

@@ -1,4 +0,0 @@
-phonon-gstreamer
-polkit-qt
-extra-cmake-modules
-phonon

data/pkglists/kernel.list

@@ -1,17 +0,0 @@
-linux
-nvidia
-nvidia-utils
-acpi_call
-bbswitch
-broadcom-wl
-tp_smapi
-r8168
-virtualbox-modules-artix
-linux-lts
-nvidia-lts
-acpi_call-lts
-bbswitch-lts
-broadcom-wl-lts
-tp_smapi-lts
-r8168-lts
-linux-firmware

data/pkglists/lxqt.list

@@ -1,31 +0,0 @@
-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

data/pkglists/xorg.list

@@ -1,37 +0,0 @@
-libdmx
-libfontenc
-libice
-libpciaccess
-libsm
-libx11
-libxau
-libxaw
-libxcomposite
-libxcursor
-libxdamage
-libxdmcp
-libxext
-libxfixes
-libxfont2
-libxi|libxft
-libxinerama
-libxkbfile
-libxkbui
-libxmu
-libxpm
-libxrandr
-libxrender
-libxres
-libxshmfence
-libxss
-libxt
-libxtst
-libxv
-libxvmc
-libxxf86vm
-pixman
-xbitmaps
-xkeyboard-config
-xorgproto
-xterm
-xtrans

lib/base/util.sh

@@ -76,19 +76,23 @@ init_artools_pkg(){
 
     [[ -z ${TREE_NAMES_ARTIX[@]} ]] && \
     TREE_NAMES_ARTIX=(
-        packages
+            packages
-        community
+            community
-        packages-kernel
+            packages-kernel
-        packages-openrc
+            packages-openrc
-        packages-runit
+            packages-runit
-        packages-xorg
+            packages-xorg
-        packages-python
+            packages-python
-        packages-perl
+            packages-perl
-        packages-qt5
+            packages-qt5
-        packages-ruby
+            packages-devel
-#         packages-desktop
+            packages-ruby
-#         packages-kde
+            packages-gtk
-#         packages-gnome
+            packages-gnome
+            packages-cinnamon
+            packages-lxqt
+            packages-mate
+            packages-kde
     )
 
     HOST_TREE_ARTIX=${HOST_TREE_ARTIX:-"gitea@${GIT_DOMAIN}:artixlinux"}

lib/iso/chrootcfg.sh

@@ -153,9 +153,9 @@ configure_calamares(){
         msg2 "Configuring Calamares"
         write_users_conf > "$mods"/users.conf
         write_servicescfg_conf > "$mods"/services-"${INITSYS}".conf
+        [[ -z ${DESKTOP_LIST} ]] && write_unpackfs_conf > "$mods"/unpackfs.conf
         sed -e "s|openrc|${INITSYS}|" -i "$mods"/postcfg.conf
         sed -e "s|services-openrc|services-${INITSYS}|" -i "$1"/etc/calamares/settings.conf
-        [[ -z ${DESKTOP_LIST} ]] && write_unpackfs_conf > "$mods"/unpackfs.conf
     fi
 }
 

lib/pkg/subrepo.sh

@@ -23,14 +23,12 @@ get_remote_head(){
 get_pkg_org(){
     local pkg="$1" org= sub=
     case ${pkg} in
-        ruby-*) org=${pkg:0:6}; sub="${org:5}"; echo "packagesRuby" ;;
+        ruby-*) org="packagesRuby" ;;
-        perl-*) org=${pkg:0:6}; sub="${org:5}"; echo "packagesPerl" ;;
+        perl-*) org="packagesPerl" ;;
-        python-*) org=${pkg:0:8}; sub="${org:7}"; echo "packagesPython" ;;
+        python-*|python2-*) org="packagesPython" ;;
-        python2-*) org=${pkg:0:9}; sub="${org:8}"; echo "packagesPython" ;;
+        *) sub=${pkg:0:1}; org="packages${sub^^}" ;;
-        lib32*) org=${pkg:0:7}; sub="${org:6}"; echo "packagesL" ;; #"packages${sub^^}" ;;
-#         lib*) org=${pkg:0:4}; sub="${org:3}"; echo "packagesLib${sub^^}" ;;
-        *) org=${pkg:0:1}; echo "packages${org^^}" ;;
     esac
+    echo $org
 }
 
 subrepo_push(){

lib/pkg/util.sh

@@ -127,7 +127,8 @@ is_valid_repo(){
 }
 
 get_cases(){
-    local pkglist="${DATADIR}/pkglists/$1.list"
+    local pkglist="${SYSCONFDIR}/pkglist.d/$1.list"
+
     local _space="s| ||g" _clean=':a;N;$!ba;s/\n/ /g' _com_rm="s|#.*||g"
 
     local pkgs=($(sed "$_com_rm" "$pkglist" | sed "$_space" | sed "$_clean"))
@@ -143,22 +144,24 @@ get_artix_tree(){
     local pkg="$1" artix_tree="${2:-$3}" tree
     eval "case $pkg in
         $(get_cases kernel)) tree=packages-kernel ;;
-        python-*|python2-*) tree=packages-python ;;
+        $(get_cases python)) tree=packages-python ;;
-        perl-*) tree=packages-perl ;;
+        $(get_cases perl)) tree=packages-perl ;;
-        ruby-*) tree=packages-ruby ;;
+        $(get_cases ruby)) tree=packages-ruby ;;
-        xorg*|xf86*|$(get_cases xorg)) tree=packages-xorg ;;
+        $(get_cases openrc)) tree=packages-openrc ;;
-        *-openrc) tree=packages-openrc ;;
+        $(get_cases runit)) tree=packages-runit ;;
-        *-runit) tree=packages-runit ;;
+        $(get_cases media)) tree=packages-media ;;
-        qt5-*) tree=packages-qt5 ;;
+        $(get_cases xorg)) tree=packages-xorg ;;
-        lxqt*|$(get_cases lxqt)) tree=packages-lxqt ;;
+        $(get_cases qt5)) tree=packages-qt5 ;;
+        $(get_cases gtk)) tree=packages-gtk ;;
+        $(get_cases devel)) tree=packages-devel ;;
+        $(get_cases lxqt)) tree=packages-lxqt ;;
+        $(get_cases cinnamon)) tree=packages-cinnamon ;;
+        $(get_cases kde)) tree=packages-kde ;;
+        $(get_cases gnome)) tree=packages-gnome ;;
+        $(get_cases mate)) tree=packages-mate ;;
         *) tree=$artix_tree
     esac"
     echo $tree
-
-#         $(get_cases freedesktop)) tree=packages-desktop ;;
-#         $(get_cases kde)) tree=packages-kde ;;
-#         $(get_cases gnome)) tree=packages-gnome ;;
-
 }
 
 get_import_path(){