Merge pull request #46 from artix-linux/devel

Devel

Makefile

@@ -24,9 +24,6 @@ LIBS_BASE = \
 SHARED_BASE = \
 	$(wildcard data/pacman*.conf)
 
-LIST_IMPORT = \
-	$(wildcard data/import.list.d/*.list)
-
 BIN_PKG = \
 	bin/checkpkg \
 	bin/lddd \
@@ -58,7 +55,7 @@ COMMITPKG_SYMS = \
 	multilibpkg \
 	multilib-testingpkg \
 	multilib-stagingpkg
-	
+
 BIN_ISO = \
 	bin/buildiso \
 	bin/deployiso
@@ -126,16 +123,13 @@ install_base:
 	install -m0644 ${SHARED_BASE} $(DESTDIR)$(PREFIX)/share/artools
 
 install_pkg:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d
-	install -m0644 ${LIST_IMPORT} $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d
-
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
 	install -m0755 ${BIN_PKG} $(DESTDIR)$(PREFIX)/bin
-	
+
 	ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
-	
+
 	for l in ${COMMITPKG_SYMS}; do ln -sf commitpkg $(DESTDIR)$(PREFIX)/bin/$$l; done
-	
+
 	install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
 	install -m0644 ${LIBS_PKG} $(DESTDIR)$(PREFIX)/lib/artools
 
@@ -188,7 +182,6 @@ uninstall_base:
 	for f in ${LIBS_BASE}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
 
 uninstall_pkg:
-	for f in ${LIST_IMPORT}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d/$$f; done
 	for f in ${BIN_PKG}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
 	rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
 	for l in ${COMMITPKG_SYMS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done

bin/buildtree.in

@@ -17,24 +17,7 @@ DATADIR='@datadir@'
 
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
 import ${LIBDIR}/util.sh
-
-get_local_head(){
-    echo $(git log --pretty=%H ...refs/heads/$1^ | head -n 1)
-}
-
-get_remote_head(){
-    echo $(git ls-remote origin -h refs/heads/$1 | cut -f1)
-}
-
-is_dirty() {
-    [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]] || return 1
-    return 0
-}
-
-is_untracked(){
-    [[ $(git ls-files --others --exclude-standard)  != "" ]] || return 1
-    return 0
-}
+import ${LIBDIR}/util-pkg.sh
 
 pull_tree(){
     local branch="master" tree="$1"
@@ -90,155 +73,11 @@ pull_tree_artix(){
     done
 }
 
-read_import_list(){
-    local tree="$1"
-    local _space="s| ||g" _clean=':a;N;$!ba;s/\n/ /g' _com_rm="s|#.*||g"
-    import_list=$(sed "$_com_rm" "${list_dir_import}/$tree.list" | sed "$_space" | sed "$_clean")
-}
-
-patch_pkg(){
-    local pkg="$1" repo="$2"
-    case $pkg in
-        'glibc')
-            sed -e 's|{locale,systemd/system,tmpfiles.d}|{locale,tmpfiles.d}|' \
-                -e '/nscd.service/d' \
-                -i $pkg/trunk/PKGBUILD
-        ;;
-        'tp_smapi'|'acpi_call'|'r8168')
-            sed -e 's|-ARCH|-ARTIX|g' -i $pkg/trunk/PKGBUILD
-        ;;
-        'linux')
-            sed -e 's|-ARCH|-ARTIX|g' -i $pkg/trunk/PKGBUILD
-            sed -e 's|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION="-ARTIX"|' \
-                -e 's|CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME="artixlinux"|' \
-                -i $pkg/trunk/config
-            cd $pkg/trunk
-                updpkgsums
-            cd ../..
-
-        ;;
-        'licenses')
-            sed -e 's|https://www.archlinux.org/|https://www.artixlinux.org/|' -i $pkg/trunk/PKGBUILD
-        ;;
-    esac
-}
-
-get_import_path(){
-    local tree="$1" import_path=
-    case $tree in
-        packages) import_path=${tree_dir_arch}/packages ;;
-        packages-galaxy) import_path=${tree_dir_arch}/community ;;
-    esac
-    echo $import_path
-}
-
-find_repo(){
-    local pkg="$1" repo=
-
-    if [[ -d $pkg/repos/core-x86_64 ]];then
-        repo=core-x86_64
-    elif [[ -d $pkg/repos/core-any ]];then
-        repo=core-any
-    fi
-
-    if [[ -d $pkg/repos/extra-x86_64 ]];then
-        repo=extra-x86_64
-    elif [[ -d $pkg/repos/extra-any ]];then
-        repo=extra-any
-    fi
-
-    if [[ -d $pkg/repos/testing-x86_64 ]];then
-        repo=testing-x86_64
-    elif [[ -d $pkg/repos/testing-any ]];then
-        repo=testing-any
-    fi
-
-    if [[ -d $pkg/repos/staging-x86_64 ]];then
-        repo=staging-x86_64
-    elif [[ -d $pkg/repos/staging-any ]];then
-        repo=staging-any
-    fi
-
-    if [[ -d $pkg/repos/community-x86_64 ]];then
-        repo=community-x86_64
-    elif [[ -d $pkg/repos/community-any ]];then
-        repo=community-any
-    fi
-
-    if [[ -d $pkg/repos/community-testing-x86_64 ]];then
-        repo=community-testing-x86_64
-    elif [[ -d $pkg/repos/community-testing-any ]];then
-        repo=community-testing-any
-    fi
-
-    if [[ -d $pkg/repos/community-staging-x86_64 ]];then
-        repo=community-staging-x86_64
-    elif [[ -d $pkg/repos/community-staging-any ]];then
-        repo=community-staging-any
-    fi
-
-    if [[ -d $pkg/repos/multilib-x86_64 ]];then
-        repo=multilib-x86_64
-    fi
-
-    if [[ -d $pkg/repos/multilib-testing-x86_64 ]];then
-        repo=multilib-testing-x86_64
-    fi
-
-    if [[ -d $pkg/repos/multilib-staging-x86_64 ]];then
-        repo=multilib-staging-x86_64
-    fi
-
-    echo $repo
-}
-
-view_artix_repo(){
-    local repo="$1"
-    case $repo in
-        core-*) repo=system ;;
-        extra-*) repo=world ;;
-        community-*) repo=galaxy ;;
-        multilib-x86_64) repo=lib32 ;;
-        testing-*) repo=gremlins ;;
-        staging-*) repo=goblins ;;
-        multilib-testing-x86_64) repo=lib32-gremlins ;;
-        multilib-staging-x86_64) repo=lib32-goblins ;;
-        community-testing-*) repo=galaxy-gremlins ;;
-        community-staging-*) repo=galaxy-goblins ;;
-    esac
-    echo $repo
-}
-
-show_downgrade_table(){
+show_version_table(){
     msg_table_header "%-20s %-20s %-25s %-30s %-30s" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version"
     for tree in packages packages-galaxy;do
-        for pkg_path in ${tree_dir_artix}/$tree/*; do
-            local artixrepo=$(find_repo "$pkg_path")
-            if [[ -d $pkg_path/repos/$artixrepo ]];then
-                source $pkg_path/repos/$artixrepo/PKGBUILD 2>/dev/null
-                local pkg=${pkg_path##*/}
-                local artixver=$(get_full_version $pkg)
-                local src=$(get_import_path "$tree" "$pkg")
-                local archrepo=$(find_repo "$src/$pkg")
-                if [[ -d $src/$pkg/repos/$archrepo ]];then
-                    source $src/$pkg/repos/$archrepo/PKGBUILD 2>/dev/null
-                    local archver=$(get_full_version $pkg)
-                fi
-                if [ $(vercmp $artixver $archver) -gt 0 ];then
-                    local ar=$(view_artix_repo "$artixrepo")
-                    msg_row_downgrade "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
-                fi
-                unset pkgver epoch pkgrel artixver archver _package
-            fi
-        done
-    done
-}
-
-show_upgrade_table(){
-    declare -A UPDATES
-    msg_table_header "%-20s %-20s %-25s %-30s %-30s" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version"
-    for tree in packages packages-galaxy;do
-        for pkg_path in ${tree_dir_artix}/$tree/*; do
+        local git=$(find ${tree_dir_artix}/$tree/ -mindepth 1 -maxdepth 1 -type d)
+        for pkg_path in ${git[@]}; do
             local artixrepo=$(find_repo "$pkg_path")
             if [[ -d $pkg_path/repos/$artixrepo ]];then
                 source $pkg_path/trunk/PKGBUILD 2>/dev/null
@@ -251,17 +90,61 @@ show_upgrade_table(){
                     local archver=$(get_full_version $pkg)
                 fi
                 if [ $(vercmp $artixver $archver) -lt 0 ];then
-                    local ar=$(view_artix_repo "$artixrepo")
-                    UPDATES[$pkg]="$pkg_path/repos/$artixrepo/PKGBUILD $src/$pkg/repos/$archrepo/PKGBUILD"
-                    msg_row_update "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                    local ar=$(arch_to_artix_repo "$artixrepo")
+                    ${upgrades} && msg_row_upgrade "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                fi
+                if [ $(vercmp $artixver $archver) -gt 0 ];then
+                    local ar=$(arch_to_artix_repo "$artixrepo")
+                    if [[ -n $archver ]] && [[ -n $archrepo ]];then
+                        ${downgrades} && msg_row_downgrade "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                    fi
                 fi
                 unset pkgver epoch pkgrel artixver archver _package
             fi
         done
     done
-    find "${patches_dir}/" -name *.patch -delete
-    for upd in "${!UPDATES[@]}"; do
-        diff -u ${UPDATES[$upd]} > ${patches_dir}/"$upd"-archlinux.patch
+}
+
+show_artix_table(){
+     msg_table_header "%-20s %-20s %-25s %-30s %-30s" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version"
+    for tree in packages packages-galaxy;do
+        local git=$(find ${tree_dir_artix}/$tree/ -mindepth 1 -maxdepth 1 -type d)
+        for pkg_path in ${git[@]}; do
+            local artixrepo=$(find_repo "$pkg_path")
+            if [[ -d $pkg_path/repos/$artixrepo ]];then
+                source $pkg_path/repos/$artixrepo/PKGBUILD 2>/dev/null
+                local pkg=${pkg_path##*/}
+                local artixver=$(get_full_version $pkg)
+                local src=$(get_import_path "$tree" "$pkg")
+                local archrepo=$(find_repo "$src/$pkg")
+                if [[ -d $src/$pkg/repos/$archrepo ]];then
+                    source $src/$pkg/repos/$archrepo/PKGBUILD 2>/dev/null
+                    local archver=$(get_full_version $pkg)
+                fi
+                if [ $(vercmp $artixver $archver) -eq 0 ] || [ $(vercmp $artixver $archver) -gt 0 ];then
+
+                    local ar=$(arch_to_artix_repo "$artixrepo")
+                    case $ar in
+                        *goblins)
+                            if [[ $archrepo == $artixrepo ]];then
+                                msg_row "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                            else
+                                msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                            fi
+                        ;;
+                        *gremlins)
+                            if [[ $archrepo == $artixrepo ]];then
+                                msg_row "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                            else
+                                msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                            fi
+                        ;;
+#                         system|world|galaxy|lib32) msg_row "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver" ;;
+                    esac
+                fi
+                unset pkgver epoch pkgrel artixver archver _package
+            fi
+        done
     done
 }
 
@@ -281,7 +164,6 @@ from_arch(){
         cd ${tree_dir_artix}/$artixtree
         local artixver=$(get_full_version $pkg)
         msg2 "Artix Version: %s" "$artixver"
-        info "artixver: %s" "$artixver"
         if [ $(vercmp $artixver $archver) -lt 0 ];then
             info "Importing from archlinux (%s)" "$archtree"
             rsync "${rsync_args[@]}" $src/ $dest/
@@ -298,18 +180,6 @@ from_arch(){
     fi
 }
 
-import_from_arch(){
-    for tree in packages packages-galaxy;do
-        info "Importing from archlinux %s" "$tree"
-        read_import_list "$tree"
-        cd ${tree_dir_artix}/$tree
-        for pkg in ${import_list[@]};do
-            [[ "$tree" == 'packages' ]] && from_arch "$pkg" "$tree" "$tree"
-            [[ "$tree" == 'packages-galaxy' ]] && from_arch "$pkg" "community" "$tree"
-        done
-    done
-}
-
 sync_repos(){
     pull_tree_arch
     pull_tree_artix
@@ -324,16 +194,16 @@ display_settings(){
 
     msg "ARGS:"
     msg2 "sync: %s" "${sync}"
+    msg2 "compare: %s" "${compare}"
     msg2 "upgrades: %s" "${upgrades}"
     msg2 "downgrades: %s" "${downgrades}"
+    msg2 "artix: %s" "${artix}"
     msg2 "import_packages: %s" "${import_packages}"
     msg2 "import_community: %s" "${import_community}"
-    msg2 "import_all: %s" "${import_all}"
 
     msg "PATHS:"
     msg2 "tree_dir_artix: %s" "${tree_dir_artix}"
     msg2 "tree_dir_arch: %s" "${tree_dir_arch}"
-    msg2 "patches_dir: %s" "${patches_dir}"
 }
 
 load_user_info
@@ -344,11 +214,12 @@ load_vars /etc/makepkg.conf
 
 pretend=false
 sync=false
-upgrades=false
+compare=false
+upgrades=true
 downgrades=false
+artix=false
 import_packages=false
 import_community=false
-import_all=false
 package=''
 
 git_artix='packages'
@@ -360,11 +231,12 @@ usage() {
     echo "Usage: ${0##*/} [options]"
     echo '    -p <pkg>      Package name'
     echo "    -s            Clone or pull repos"
+    echo '    -c            Compare packages'
     echo '    -u            Show upgrade packages'
     echo '    -d            Show downgrade packages'
+    echo '    -a            Show artix specific packages'
     echo '    -i            Import from arch packages'
     echo '    -j            Import from arch community'
-    echo '    -k            Import arch packages'
     echo '    -q            Query settings'
     echo '    -h            This help'
     echo ''
@@ -374,17 +246,18 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:sudijkqh'
+opts='p:csudaijqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
         p) package="$OPTARG" ;;
         s) sync=true ;;
-        u) upgrades=true ;;
+        c) compare=true ;;
+        u) upgrades=false ;;
         d) downgrades=true ;;
+        a) artix=true ;;
         i) import_packages=true ;;
         j) import_community=true; git_artix='packages-galaxy'; git_arch='community' ;;
-        k) import_all=true ;;
         q) pretend=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
@@ -395,17 +268,14 @@ shift $(($OPTIND - 1))
 
 prepare_dir "${tree_dir_artix}"
 prepare_dir "${tree_dir_arch}"
-prepare_dir "${patches_dir}"
 
 ${pretend} && display_settings && exit 1
 
 ${sync} && sync_repos
 
-${upgrades} && show_upgrade_table
+${compare} && show_version_table
 
-${downgrades} && show_downgrade_table
-
-${import_all} && import_from_arch
+${artix} && show_artix_table
 
 ${import_packages} && from_arch "${package}" "${git_arch}" "${git_artix}"
 

bin/commitpkg.in

@@ -59,8 +59,10 @@ release_pkg(){
         else
             dest=${target_repo}-$CARCH
             action='add'
-            [[ -d repos/$dest ]] && git rm -r repos/$dest
             [[ ! -d repos ]] && mkdir repos
+            cd repos
+            [[ -d $dest ]] && git rm -r $dest
+            cd ..
             cp -r trunk repos/$dest
         fi
         local ver=$(get_full_version ${package})

bin/deploypkg.in

@@ -29,7 +29,7 @@ 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
-            rm -v $repo_path/${pkgfile##*/}{,.sig}
+            [[ -f $repo_path/${pkgfile##*/}{,.sig} ]] && rm -v $repo_path/${pkgfile##*/}{,.sig}
         fi
     done
 }

bin/mkchrootpkg.in

@@ -204,11 +204,11 @@ _chrootbuild() {
 
     exec </dev/console
 
-    export LANG=C
-    export TERM=$TERM
-
     . /etc/profile
 
+    export LANG=en_US.UTF-8
+    locale-gen &> /dev/null
+
     sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
 }
 

data/blacklist.d/packages-galaxy.list

@@ -1,36 +0,0 @@
-acpi_call
-acpi_call-lts
-autoconf-archive
-cmocka
-confuse
-dovecot
-hub
-hwinfo
-jansson
-lib32-fakeroot
-lib32-libltdl
-libappindicator
-libbson
-libdbi
-libdbusmenu
-libftdi
-libindicator
-libmongoc
-libnewt
-libpgm
-libreplaygain
-libsass
-libsodium
-libx86emu
-ninja
-pigeonhole
-portaudio
-r8168
-r8168-lts
-sassc
-tp_smapi
-tp_smapi-lts
-virtualbox
-virtualbox-guest-iso
-yaml-cpp
-zeromq

data/blacklist.d/packages.list

@@ -1,74 +0,0 @@
-dbus
-lvm2
-cryptsetup
-mdadm
-glibc
-iptables
-man-db
-btrfs-progs
-bash
-dhcpcd
-filesystem
-gnupg
-krb5
-libusb
-licenses
-logrotate
-mkinitcpio
-pacman
-pambase
-procps-ng
-rpcbind
-util-linux
-wpa_supplicant
-gpm
-cronie
-
-accountsservice
-alsa-utils
-apache
-avahi
-bluez
-colord
-cups
-dhcp
-fluidsynth
-git
-haveged
-libatasmart
-libblockdev
-libgudev
-libinput
-libwacom
-lirc
-mariadb
-media-player-info
-modemmmanger
-networkmanager
-openslp
-polkit
-pulseaudio
-qt5-base
-rsync
-samba
-sane
-sddm
-subversion
-syslog-ng
-udisks2
-upower
-xorg-server
-xf86-input-libinput
-xf86-input-evdev
-xf86-video-amdgpu
-xf86-video-ati
-xf86-video-intel
-xf86-video-nouveau
-xf86-video-openchrome
-xf86-video-sisusb
-
-
-
-
-
-

data/import.list.d/packages-galaxy.list

@@ -1,55 +0,0 @@
-acpi_call
-acpi_call-lts
-autoconf-archive
-cmocka
-confuse
-cython
-dmd
-dovecot
-gmock
-gtest
-hub
-hwinfo
-jansson
-lib32-fakeroot
-lib32-libltdl
-libappindicator
-libbson
-libdbi
-libdbusmenu
-libftdi
-libindicator
-libmongoc
-libnewt
-libpgm
-libphobos
-libreplaygain
-libsass
-libsodium
-libx86emu
-ninja
-pigeonhole
-portaudio
-python-babel
-python-docutils
-python-imagesize
-python-jinja
-python-pygments
-python-pytz
-python-snowballstemmer
-python-sphinx
-python-sphinx-alabaster-theme
-python-sphinxcontrib-websupport
-python-sphinx_rtd_theme
-python-sqlalchemy
-python-whoosh
-r8168
-r8168-lts
-rust
-sassc
-tp_smapi
-tp_smapi-lts
-virtualbox
-virtualbox-guest-iso
-yaml-cpp
-zeromq

data/import.list.d/packages.list

@@ -1,687 +0,0 @@
-a52dec
-aalib
-acl
-adwaita-icon-theme
-alsa-firmware
-alsa-lib
-apr
-apr-util
-archlinux-keyring
-argon2
-aspell
-assimp
-atk
-atkmm
-at-spi2-atk
-at-spi2-core
-attr
-autoconf
-automake
-b43-fwcutter
-babl
-# bash
-bc
-binutils
-bison
-boost
-bridge-utils
-brltty
-bzip2
-ca-certificates
-ca-certificates-cacert
-cairo
-cairomm
-cantarell-fonts
-cdparanoia
-check
-cifs-utils
-cln
-cmake
-convertlit
-coreutils
-cpio
-cracklib
-curl
-dash
-db
-dbus-glib
-dbus-python
-dcadec
-dconf
-desktop-file-utils
-dialog
-diffutils
-ding-libs
-dkms
-dnssec-anchors
-docbook-dsssl
-docbook-sgml31
-docbook-utils
-docbook-xml
-docbook-xsl
-dosfstools
-dotconf
-double-conversion
-doxygen
-e2fsprogs
-ebook-tools
-ed
-editorconfig-core-c
-efibootmgr
-efivar
-elfutils
-exiv2
-expat
-extra-cmake-modules
-faad2
-fakeroot
-ffmpeg
-ffmpeg2.8
-fftw
-file
-findutils
-flac
-flex
-fontconfig
-freetype2
-fribidi
-fuse2
-fuse3
-gamin
-gawk
-gc
-gcab
-gcc
-gconf
-gcr
-gd
-gdb
-gdbm
-gdk-pixbuf2
-gegl02
-geoip-database
-gettext
-ghostscript
-giblib
-giflib
-glade
-glib2
-glibc
-glibmm
-glib-networking
-glu
-gmp
-gnome-common
-gnutls
-gobject-introspection
-gperf
-gperftools
-gpgme
-gptfdisk
-grantlee
-graphite
-graphviz
-grep
-groff
-gsettings-desktop-schemas
-gsfonts
-gsm
-gst-plugins-base
-gst-plugins-good
-gstreamer
-gtk2
-gtk3
-gtk-doc
-gtkmm3
-gtk-sharp-2
-gtksourceview3
-gts
-guile
-guile2.0
-gzip
-harfbuzz
-hdparm
-hicolor-icon-theme
-hunspell
-hwids
-hwloc
-hyphen
-iana-etc
-icu
-ifenslave
-ijs
-ilmbase
-imagemagick
-imlib2
-iniparser
-intltool
-iproute2
-iputils
-ipw2100-fw
-ipw2200-fw
-isdn4k-utils
-iso-codes
-itstool
-iw
-jack
-jasper
-java8-openjdk
-java-common
-jbig2dec
-jemalloc
-jfsutils
-js
-json-c
-jsoncpp
-json-glib
-kbd
-keyutils
-lame
-lapack
-lcms
-lcms2
-ldb
-ldns
-less
-libaccounts-glib
-libaccounts-qt
-libaio
-libao
-libarchive
-libass
-libassuan
-libasyncns
-libatomic_ops
-libavc1394
-libbluray
-libbsd
-libburn
-libbytesize
-libcaca
-libcanberra
-libcap
-libcap-ng
-libcddb
-libcdio
-libcdio-paranoia
-#libconfig
-libcroco
-libcue
-libdaemon
-libdatrie
-libdbusmenu-qt
-libdca
-libdmtx
-libdrm
-libdv
-libdvbpsi
-libdvdcss
-libdvdnav
-libdvdread
-libebml
-libedit
-libepoxy
-libevdev
-libevent
-libexif
-libffi
-libfontenc
-libgcrypt
-libgdiplus
-libgee
-libgit2
-libglade
-libglvnd
-libgpg-error
-libgphoto2
-libgssglue
-libgusb
-libical
-libice
-libid3tag
-libidn
-libidn2
-libiec61883
-libieee1284
-libimobiledevice
-libiscsi
-libisoburn
-libisofs
-libjpeg-turbo
-libksba
-liblouis
-liblqr
-libmad
-libmatroska
-libmng
-libmnl
-libmodplug
-libmpc
-libmpeg2
-libmspack
-libmtp
-libndp
-libnftnl
-libnghttp2
-libnl
-libnotify
-libogg
-libomxil-bellagio
-libpaper
-libpcap
-libpciaccess
-libpipeline
-libplist
-libpng
-libproxy
-libpsl
-libpwquality
-libqalculate
-libqmi
-libraqm
-libraw1394
-librpcsecgss
-librsvg
-libsamplerate
-libseccomp
-libsecret
-libshout
-libsigc++
-libsigsegv
-libsm
-libsndfile
-libsoup
-libsoxr
-libspiro
-libsrtp
-libssh
-libssh2
-libtar
-libtasn1
-libthai
-libtheora
-libtiff
-libtirpc
-libtommath
-libtool
-libunistring
-libunwind
-libupnp
-libusb-compat
-libusbmuxd
-libutempter
-libuv
-libva
-libvdpau
-libvisual
-libvorbis
-libvpx
-libwebp
-libwmf
-libx11
-libxau
-libxaw
-libxcb
-libxcomposite
-libxcursor
-libxdamage
-libxdmcp
-libxext
-libxfixes
-libxfont2
-libxft
-libxi
-libxinerama
-libxkbcommon
-libxkbfile
-libxml2
-libxmu
-libxpm
-libxrandr
-libxrender
-libxres
-libxshmfence
-libxslt
-libxss
-libxt
-libxtst
-libxv
-libxvmc
-libxxf86vm
-libyaml
-libzip
-licenses
-links
-linux
-linux-api-headers
-linux-atm
-linux-firmware
-linux-lts
-lirc
-llvm
-lmdb
-lua
-lz4
-lzo
-m4
-mailcap
-make
-man-pages
-mercurial
-mesa
-meson
-mkinitcpio-busybox
-mkinitcpio-nfs-utils
-mobile-broadband-provider-info
-mono
-mpfr
-mtdev
-muparser
-musepack
-namcap
-nano
-nasm
-ncurses
-nettle
-net-tools
-network-manager-applet
-nfsidmap
-nilfs-utils
-noto-fonts
-npth
-nspr
-nss
-nss-mdns
-ntfs-3g
-numactl
-nvidia
-# nvidia-settings
-nvidia-utils
-ocl-icd
-openal
-opencore-amr
-openexr
-openjade
-openjpeg
-openjpeg2
-openmpi
-opensp
-openssl
-openssl-1.0
-opus
-orc
-orca
-p11-kit
-pango
-pangomm
-parted
-patch
-pciutils
-pcre
-pcre2
-perl
-perl-error
-perl-file-which
-perl-xml-parser
-perl-yaml
-phonon
-phonon-gstreamer
-pinentry
-pixman
-pkcs11-helper
-pkg-config
-polkit-qt
-poppler
-popt
-potrace
-pptpclient
-procinfo-ng
-protobuf
-psmisc
-pth
-pyalpm
-pygobject
-pygtk
-# pylint
-pyqt5
-python
-python2
-# python2-backports
-# python2-backports.functools_lru_cache
-# python2-configparser
-# python2-ipaddress
-python-appdirs
-python-asn1crypto
-# python-astroid
-python-attrs
-# python-automat
-python-beaker
-python-cairo
-# python-cffi
-python-chardet
-# python-constantly
-# python-cryptography
-python-cssselect
-python-defusedxml
-# python-editdistance
-# python-egenix-mx-base
-python-evdev
-# python-feedparser
-# python-fpconst
-# python-gdata
-# python-geoip
-python-hyperlink
-python-idna
-# python-incremental
-# python-isort
-# python-iwscan
-# python-lazy-object-proxy
-# python-lxml
-python-mako
-python-markupsafe
-# python-mccabe
-# python-mpd
-# python-nose
-python-notify
-python-numpy
-python-packaging
-python-pip
-python-ply
-python-pyasn1
-# python-pyasn1-modules
-# python-pycparser
-# python-pycurl
-python-pyelftools
-# python-pygame
-python-pyparsing
-# python-rdflib
-# python-requests
-python-requests
-# python-retrying
-# python-service-identity
-python-setuptools
-python-six
-# python-soappy
-# python-telepathy
-# python-urllib3
-python-urllib3
-python-urwid
-python-virtualenv
-# python-wpactrl
-python-wrapt
-# python-wstools
-pyxdg
-qt4
-qt5-3d
-qt5-canvas3d
-qt5-charts
-qt5-connectivity
-qt5-datavis3d
-qt5-declarative
-qt5-doc
-qt5-examples
-qt5-gamepad
-qt5-graphicaleffects
-qt5-imageformats
-qt5-location
-qt5-multimedia
-qt5-networkauth
-qt5-quickcontrols
-qt5-quickcontrols2
-qt5-remoteobjects
-qt5-script
-qt5-scxml
-qt5-sensors
-qt5-serialbus
-qt5-serialport
-qt5-speech
-qt5-svg
-qt5-tools
-qt5-translations
-qt5-virtualkeyboard
-qt5-wayland
-qt5-webchannel
-qt5-webengine
-qt5-webkit
-qt5-websockets
-qt5-webview
-qt5-x11extras
-qt5-xmlpatterns
-re2
-readline
-reiserfsprogs
-rest
-ruby
-run-parts
-schroedinger
-sdl
-sdl2
-sdl_image
-sdl_sound
-sdparm
-sed
-serf
-sgml-common
-shared-mime-info
-slang
-s-nail
-snappy
-snowball
-socat
-sound-theme-freedesktop
-source-highlight
-speech-dispatcher
-speex
-speexdsp
-sqlite
-startup-notification
-sudo
-sysfsutils
-syslinux
-t1lib
-taglib
-talloc
-tar
-tcl
-tdb
-tevent
-texinfo
-texlive-bin
-texlive-core
-texlive-formatsextra
-texlive-latexextra
-texlive-pictures
-texlive-science
-thin-provisioning-tools
-traceroute
-tslib
-ttf-bitstream-vera
-ttf-dejavu
-ttf-hack
-ttf-indic-otf
-tzdata
-unixodbc
-unzip
-#usbmuxd
-usbutils
-v4l-utils
-vala
-valgrind
-vi
-vid.stab
-volume_key
-vte
-vte3
-vulkan-docs
-vulkan-loader-layers
-vulkan-tools
-wavpack
-wayland
-wayland-protocols
-webrtc-audio-processing
-wget
-which
-whois
-wireless-regdb
-wireless_tools
-wpa_actiond
-wxgtk
-x265
-xapian-core
-xbitmaps
-xcb-proto
-xcb-util
-xcb-util-cursor
-xcb-util-image
-xcb-util-keysyms
-xcb-util-renderutil
-xcb-util-wm
-xdg-utils
-xf86-input-libinput
-xf86-video-dummy
-xf86-video-fbdev
-xf86-video-sisusb
-xf86-video-vesa
-xf86-video-vmware
-xf86-video-voodoo
-xfsprogs
-xkeyboard-config
-xmlto
-xorg-bdftopcf
-xorg-fonts-alias
-xorg-fonts-encodings
-xorg-fonts-misc
-xorg-font-util
-xorg-font-utils
-xorg-luit
-xorg-mkfontdir
-xorg-mkfontscale
-xorgproto
-xorg-setxkbmap
-xorg-twm
-xorg-util-macros
-xorg-xauth
-# xorg-xinit
-xorg-xkbcomp
-xorg-xmessage
-xorg-xmodmap
-xorg-xprop
-xorg-xrandr
-xorg-xrdb
-xorg-xset
-xorg-xsetroot
-xterm
-xvidcore
-xz
-yajl
-yelp-tools
-yelp-xsl
-zd1211-firmware
-zip
-zita-alsa-pcmi
-zita-resampler
-zlib
-zsh
-zstd
-zvbi
-zziplib

data/missing

@@ -0,0 +1,20 @@
+extra/speexdsp
+extra/spandsp
+extra/soundtouch
+extra/sbc
+extra/neon
+extra/mjpegtools
+extra/libmp4v2
+extra/js
+extra/gst-plugins-bad
+extra/faac
+extra/enchant
+extra/chromaprint
+extra/python-appdirs
+extra/python-beaker
+extra/python-mako
+extra/python-markupsafe
+extra/python-packaging
+extra/python-pyparsing
+extra/ttf-liberation
+extra/appstream-glib

data/qt5.list

@@ -0,0 +1,45 @@
+qt5-base
+qt5-xmlpatterns
+qt5-x11extras
+qt5-script
+qt5-svg
+qt5-serialport
+qt5-serialbus
+qt5-networkauth
+qt5-imageformats
+qt5-declarative
+qt5-wayland
+qt5-sensors
+qt5-scxml
+qt5-connectivity
+qt5-graphicaleffects
+qt5-gamepad
+qt5-3d
+qt5-canvas3d
+qt5-datavis3d
+qt5-charts
+qt5-virtualkeyboard
+qt5-location
+qt5-multimedia
+qt5-speech
+qt5-quickcontrols
+qt5-quickcontrols2
+qt5-remoteobjects
+qt5-webchannel
+qt5-websockets
+qt5-webglplugin
+
+
+qt5-tools
+qt5-translations
+qt5-doc
+qt5-examples
+
+qt5-webengine
+qt5-webview
+
+qt5-webkit
+
+python2-pyqt5
+python-pyqt5
+pyqt5-common

lib/util-chroot.sh

@@ -53,9 +53,8 @@ default_locale(){
         if [[ ! -f "$mnt/etc/locale.gen.bak" ]];then
             info "Setting locale ..."
             mv "$mnt/etc/locale.gen" "$mnt/etc/locale.gen.bak"
-            printf '%s.UTF-8 UTF-8\n' en_US > "$mnt/etc/locale.gen"
-            printf 'LANG=%s.UTF-8\n' en_US > "$mnt/etc/locale.conf"
-            printf 'LC_MESSAGES=C\n' >> "$mnt/etc/locale.conf"
+            printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$mnt/etc/locale.gen"
+            echo 'LANG=en_US.UTF-8.UTF-8' > "$mnt/etc/locale.conf"
         fi
     elif [[ $action == "reset" ]];then
         if [[ -f "$mnt/etc/locale.gen.bak" ]];then

lib/util-msg.sh

@@ -78,7 +78,7 @@ die() {
 
 msg_table_header(){
     local mesg=$1; shift
-    printf "${GREEN} ${mesg} ${ALL_OFF}\n" "$@" >&2
+    printf "${BLUE} ${mesg} ${ALL_OFF}\n" "$@" >&2
 }
 
 msg_row_downgrade(){
@@ -86,7 +86,17 @@ msg_row_downgrade(){
     printf "${YELLOW} ${mesg}${ALL_OFF}\n" "$@" >&2
 }
 
-msg_row_update(){
+msg_row_notify(){
+    local mesg=$1; shift
+    printf "${GREEN} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+msg_row_downgrade(){
+    local mesg=$1; shift
+    printf "${YELLOW} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+msg_row_upgrade(){
     local mesg=$1; shift
     printf "${RED}${BOLD} ${mesg} ${ALL_OFF}\n" "$@" >&2
 }

lib/util-pkg.sh

@@ -9,6 +9,154 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+get_local_head(){
+    echo $(git log --pretty=%H ...refs/heads/$1^ | head -n 1)
+}
+
+get_remote_head(){
+    echo $(git ls-remote origin -h refs/heads/$1 | cut -f1)
+}
+
+is_dirty() {
+    [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]] || return 1
+    return 0
+}
+
+is_untracked(){
+    [[ $(git ls-files --others --exclude-standard)  != "" ]] || return 1
+    return 0
+}
+
+patch_pkg(){
+    local pkg="$1" repo="$2"
+    case $pkg in
+        'glibc')
+            sed -e 's|{locale,systemd/system,tmpfiles.d}|{locale,tmpfiles.d}|' \
+                -e '/nscd.service/d' \
+                -i $pkg/trunk/PKGBUILD
+        ;;
+        'tp_smapi'|'acpi_call'|'r8168'|'bbswitch')
+            sed -e 's|-ARCH|-ARTIX|g' -i $pkg/trunk/PKGBUILD
+        ;;
+        'nvidia')
+            sed -e 's|-ARCH|-ARTIX|g'  -e 's|for Arch kernel|for Artix kernel|g' \
+                -e 's|for LTS Arch kernel|for LTS Artix kernel|g' \
+                -i $pkg/trunk/PKGBUILD
+        ;;
+        'linux')
+            sed -e 's|-ARCH|-ARTIX|g' -i $pkg/trunk/PKGBUILD
+            sed -e 's|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION="-ARTIX"|' \
+                -e 's|CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME="artixlinux"|' \
+                -i $pkg/trunk/config
+            cd $pkg/trunk
+                updpkgsums
+            cd ../..
+
+        ;;
+        'licenses')
+            sed -e 's|https://www.archlinux.org/|https://www.artixlinux.org/|' -i $pkg/trunk/PKGBUILD
+        ;;
+        'bash')
+            sed -e 's|system.bash_logout)|system.bash_logout artix.bashrc)|' \
+            -e "s|etc/bash.|etc/bash/|g" \
+            -e 's|"$pkgdir/etc/skel/.bash_logout"|"$pkgdir/etc/skel/.bash_logout"\n  install -Dm644 artix.bashrc $pkgdir/etc/bash/bashrc.d/artix.bashrc|' \
+            -i $pkg/trunk/PKGBUILD
+
+
+            cd $pkg/trunk
+                patch -Np 1 -i ${DATADIR}/patches/artix-bash.patch
+                updpkgsums
+            cd ../..
+        ;;
+    esac
+}
+
+get_import_path(){
+    local tree="$1" import_path=
+    case $tree in
+        packages) import_path=${tree_dir_arch}/packages ;;
+        packages-galaxy) import_path=${tree_dir_arch}/community ;;
+    esac
+    echo $import_path
+}
+
+find_repo(){
+    local pkg="$1" repo=
+
+    if [[ -d $pkg/repos/core-x86_64 ]];then
+        repo=core-x86_64
+    elif [[ -d $pkg/repos/core-any ]];then
+        repo=core-any
+    fi
+
+    if [[ -d $pkg/repos/extra-x86_64 ]];then
+        repo=extra-x86_64
+    elif [[ -d $pkg/repos/extra-any ]];then
+        repo=extra-any
+    fi
+
+    if [[ -d $pkg/repos/testing-x86_64 ]];then
+        repo=testing-x86_64
+    elif [[ -d $pkg/repos/testing-any ]];then
+        repo=testing-any
+    fi
+
+    if [[ -d $pkg/repos/staging-x86_64 ]];then
+        repo=staging-x86_64
+    elif [[ -d $pkg/repos/staging-any ]];then
+        repo=staging-any
+    fi
+
+    if [[ -d $pkg/repos/community-x86_64 ]];then
+        repo=community-x86_64
+    elif [[ -d $pkg/repos/community-any ]];then
+        repo=community-any
+    fi
+
+    if [[ -d $pkg/repos/community-testing-x86_64 ]];then
+        repo=community-testing-x86_64
+    elif [[ -d $pkg/repos/community-testing-any ]];then
+        repo=community-testing-any
+    fi
+
+    if [[ -d $pkg/repos/community-staging-x86_64 ]];then
+        repo=community-staging-x86_64
+    elif [[ -d $pkg/repos/community-staging-any ]];then
+        repo=community-staging-any
+    fi
+
+    if [[ -d $pkg/repos/multilib-x86_64 ]];then
+        repo=multilib-x86_64
+    fi
+
+    if [[ -d $pkg/repos/multilib-testing-x86_64 ]];then
+        repo=multilib-testing-x86_64
+    fi
+
+    if [[ -d $pkg/repos/multilib-staging-x86_64 ]];then
+        repo=multilib-staging-x86_64
+    fi
+
+    echo $repo
+}
+
+arch_to_artix_repo(){
+    local repo="$1"
+    case $repo in
+        core-*) repo=system ;;
+        extra-*) repo=world ;;
+        community-x86_64|community-any) repo=galaxy ;;
+        multilib-x86_64) repo=lib32 ;;
+        testing-*) repo=gremlins ;;
+        staging-*) repo=goblins ;;
+        multilib-testing-x86_64) repo=lib32-gremlins ;;
+        multilib-staging-x86_64) repo=lib32-goblins ;;
+        community-testing-*) repo=galaxy-gremlins ;;
+        community-staging-*) repo=galaxy-goblins ;;
+    esac
+    echo $repo
+}
+
 # $1: sofile
 # $2: soarch
 process_sofile() {

lib/util.sh

@@ -73,14 +73,8 @@ init_artools_pkg(){
 
     [[ -z ${host_tree_arch} ]] && host_tree_arch='git://projects.archlinux.org/svntogit'
 
-    list_dir_import="${SYSCONFDIR}/import.list.d"
-
-    [[ -d ${AT_USERCONFDIR}/import.list.d ]] && list_dir_import=${AT_USERCONFDIR}/import.list.d
-
     chroots_pkg="${chroots_dir}/buildpkg"
 
-    [[ -z ${patches_dir} ]] && patches_dir=${workspace_dir}/archlinux-patches
-
     [[ -z ${repos_root} ]] && repos_root="${workspace_dir}/repos"
 }