Merge pull request #28 from artix-linux/devel

Devel-0.5.3

Makefile

@@ -132,9 +132,6 @@ install_base:
 	install -m0644 ${SHARED_BASE} $(DESTDIR)$(PREFIX)/share/artools
 
 install_pkg:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/artools/pkg.list.d
-	install -m0644 ${LIST_PKG} $(DESTDIR)$(SYSCONFDIR)/artools/pkg.list.d
-
 	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d
 	install -m0644 ${LIST_IMPORT} $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d
 
@@ -207,7 +204,6 @@ uninstall_base:
 	for f in ${LIBS_BASE}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
 
 uninstall_pkg:
-	for f in ${LIST_PKG}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/pkg.list.d/$$f; done
 	for f in ${LIST_IMPORT}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d/$$f; done
 	for f in ${ARCH_CONF}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/make.conf.d/$$f; done
 	for f in ${BIN_PKG}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done

README.md

@@ -31,16 +31,12 @@ By default it is commented and shows just initialization values done in code.
 Tools configuration is done in artools.conf or by args.
 Specifying args will override artools.conf settings.
 
-User build lists(eg 'my-super-build.list') can be placed in
-
 ~~~
-$HOME/.config/artools/pkg.list.d
+$HOME/.config/artools/import.list.d
-$HOME/.config/artools/iso.list.d
 ~~~
 
 overriding
 
 ~~~
-/etc/artools/pkg.list.d
+/etc/artools/import.list.d
-/etc/artools/iso.list.d
 ~~~

bin/buildtree.in

@@ -37,7 +37,6 @@ display_settings(){
 
     msg "ARGS:"
     msg2 "verbose: %s" "${verbose}"
-    msg2 "artix: %s" "${artix}"
     msg2 "arch: %s" "${arch}"
     msg2 "import_arch: %s" "${import_arch}"
 
@@ -57,7 +56,6 @@ load_user_info
 
 load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
 
-artix=false
 pretend=false
 arch=false
 import_arch=false
@@ -67,7 +65,6 @@ rsync_args=(-aWx --progress --delete --no-R --no-implied-dirs)
 
 usage() {
     echo "Usage: ${0##*/} [options]"
-    echo "    -x            Sync artix import tree"
     echo "    -a            Sync arch tree"
     echo '    -i            Import arch packages'
     echo '    -v            Verbose import output'
@@ -80,11 +77,10 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='xaivqh'
+opts='aivqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        x) artix=true ;;
         a) arch=true ;;
         i) import_arch=true ;;
         v) verbose=true; rsync_args+=(-v --stats) ;;
@@ -101,8 +97,6 @@ prepare_dir "${tree_dir_arch}"
 
 ${pretend} && display_settings && exit 1
 
-${artix} && sync_tree_artix
-
 ${arch} && sync_tree_arch
 
 ${import_arch} && import_from_arch

data/pkg.list.d/default.list

@@ -1 +0,0 @@
-openrc

lib/util-pkg-tree.sh

@@ -49,21 +49,6 @@ clone_tree(){
     show_elapsed_time "${FUNCNAME}" "${timer}"
 }
 
-sync_tree_artix(){
-    cd ${tree_dir_artix}
-        for repo in ${repo_tree_import[@]};do
-            if [[ -d ${repo} ]];then
-                cd ${repo}
-                    $(is_dirty) && die "[%s] has uncommited changes!" "${repo}"
-                    sync_tree "${repo}"
-                cd ..
-            else
-                clone_tree "${repo}" "${host_tree_artix}/${repo}"
-            fi
-        done
-    cd ..
-}
-
 sync_tree_arch(){
     cd ${tree_dir_arch}
         for repo in ${repo_tree_arch[@]};do
@@ -95,15 +80,16 @@ is_untracked(){
 }
 
 import_from_arch(){
-    local timer=$(get_timer)
+    local timer=$(get_timer) branch='testing'
     for repo in ${repo_tree_import[@]};do
         read_import_list "$repo"
         if [[ -n ${import_list[@]} ]];then
             cd ${tree_dir_artix}/$repo
-#             git checkout master &> /dev/null
+            git checkout $branch &> /dev/null
             $(is_dirty) && die "[%s] has uncommited changes!" "${repo}"
+            git pull origin $branch &> /dev/null
             local arch_dir=packages
-            [[ $repo == "galaxy-arch" ]] && arch_dir=community
+            [[ $repo == "galaxy" ]] && arch_dir=community
             msg "Import into [%s]" "$repo"
             for pkg in ${import_list[@]};do
                 rsync "${rsync_args[@]}" ${tree_dir_arch}/$arch_dir/$pkg/trunk/ ${tree_dir_artix}/$repo/$pkg/

lib/util-profile.sh

@@ -61,21 +61,21 @@ load_profile(){
 
     enable_live=('artix-live' 'pacman-init')
 
-    netgroups="https://raw.githubusercontent.com/artix-linux/netgroups/master"
+    [[ -z ${netgroups} ]] && netgroups="https://raw.githubusercontent.com/artix-linux/netgroups/master"
 
-    root_list=${run_dir}/base/Packages-Root
+    root_list=${DATADIR}/iso-profiles/base/Packages-Root
     [[ -f "$profdir/Packages-Root" ]] && root_list="$profdir/Packages-Root"
 
-    root_overlay="${run_dir}/base/root-overlay"
+    root_overlay="${DATADIR}/iso-profiles/base/root-overlay"
     [[ -d "$profdir/root-overlay" ]] && root_overlay="$profdir/root-overlay"
 
     [[ -f "$profdir/Packages-Desktop" ]] && desktop_list=$profdir/Packages-Desktop
     [[ -d "$profdir/desktop-overlay" ]] && desktop_overlay="$profdir/desktop-overlay"
 
-    live_list="${run_dir}/base/Packages-Live"
+    live_list="${DATADIR}/iso-profiles/base/Packages-Live"
     [[ -f "$profdir/Packages-Live" ]] && live_list="$profdir/Packages-Live"
 
-    live_overlay="${run_dir}/base/live-overlay"
+    live_overlay="${DATADIR}/iso-profiles/base/live-overlay"
     [[ -d "$profdir/live-overlay" ]] && live_overlay="$profdir/live-overlay"
 
     return 0

lib/util.sh

@@ -37,14 +37,9 @@ prepare_dir(){
     [[ ! -d $1 ]] && mkdir -p $1
 }
 
-get_release(){
-    source /etc/lsb-release
-    echo "${DISTRIB_RELEASE}"
-}
-
 get_distname(){
-    source /etc/lsb-release
+    source /usr/lib/os-release
-    echo "${DISTRIB_ID%Linux}"
+    echo "${NAME%Linux}"
 }
 
 get_disturl(){
@@ -91,9 +86,7 @@ init_artools_pkg(){
 
     [[ -z ${tree_dir_artix} ]] && tree_dir_artix=${workspace_dir}/artix
 
-    [[ -z ${repo_tree_artix[@]} ]] && repo_tree_artix=('system' 'world' 'galaxy')
+    [[ -z ${repo_tree_import[@]} ]] && repo_tree_import=('system' 'world' 'galaxy')
-
-    [[ -z ${repo_tree_import[@]} ]] && repo_tree_import=('system-arch' 'world-arch' 'galaxy-arch')
 
     [[ -z ${host_tree_artix} ]] && host_tree_artix='https://github.com/artix-linux'
 
@@ -109,12 +102,8 @@ init_artools_pkg(){
 
     chroots_pkg="${chroots_dir}/buildpkg"
 
-    list_dir_pkg="${SYSCONFDIR}/pkg.list.d"
-
     make_conf_dir="${SYSCONFDIR}/make.conf.d"
 
-    [[ -d ${AT_USERCONFDIR}/pkg.list.d ]] && list_dir_pkg=${AT_USERCONFDIR}/pkg.list.d
-
     cache_dir_pkg=${workspace_dir}/pkg
 
     prepare_dir "${cache_dir_pkg}"
@@ -135,7 +124,7 @@ init_artools_iso(){
 
     [[ -z ${profile} ]] && profile='base'
 
-    [[ -z ${dist_release} ]] && dist_release=$(get_release)
+    [[ -z ${dist_release} ]] && dist_release=$(date +%Y%m%d)
 
     dist_name=$(get_distname)