Merge pull request #54 from artix-linux/devel

Devel

bin/commitpkg.in

@@ -22,9 +22,7 @@ import ${LIBDIR}/util-pkg.sh
 commit_pkg(){
     local git_tree=$(find_tree "${tree_dir_artix}" "${package}")
     if [[ -n ${git_tree} ]];then
-        cd ${tree_dir_artix}/${git_tree}
-
-        cd ${package}
+        cd ${tree_dir_artix}/${git_tree}/${package}
 
         source trunk/PKGBUILD
         [[ $arch == 'any' ]] && CARCH=any
@@ -41,17 +39,17 @@ commit_pkg(){
             fi
             msg "Action: [%s] '%s' %s" "${source_repo}" "$pkg" "${action}"
             git commit -m "[${source_repo}] '$pkg' ${action}"
-            ${push} && push_tree
         else
             local action='modify'
             msg "Action: [%s] '%s' %s" "${source_repo}" "${package}-$ver" "${action}"
             git add .
             git commit -m "[${source_repo}] '${package}-$ver' ${action}"
-            if ${push};then
-                msg "Checking (%s)" "${git_tree}"
-                pull_tree
-                push_tree
-            fi
+        fi
+
+        if ${push};then
+            msg "Checking (%s)" "${git_tree}"
+            git pull origin master
+            git push origin master
         fi
     else
         error "Package '%s' does not exist!" "${package}"
@@ -61,9 +59,7 @@ commit_pkg(){
 symlink_commit_pkg(){
     local git_tree=$(find_tree "${tree_dir_artix}" "${package}")
     if [[ -n ${git_tree} ]];then
-        cd ${tree_dir_artix}/${git_tree}
-
-        cd ${package}
+        cd ${tree_dir_artix}/${git_tree}/${package}
 
         source trunk/PKGBUILD
         [[ $arch == 'any' ]] && CARCH=any
@@ -90,10 +86,11 @@ symlink_commit_pkg(){
         msg "Action: [%s] -> [%s] '%s' %s" "${source_repo}" "${target_repo}" "${package}-$ver" "${action}"
         git add .
         git commit -m "[${source_repo}] -> [${target_repo}] '${package}-$ver' ${action}"
+
         if ${push};then
             msg "Checking (%s)" "${git_tree}"
-            pull_tree
-            push_tree
+            git pull origin master
+            git push origin master
         fi
     else
         error "Package '%s' does not exist!" "${package}"

data/artools.conf

@@ -33,7 +33,7 @@
 # initsys="openrc"
 
 # unset defaults to given value
-# kernel="linux-lts"
+# kernel="linux"
 
 # custom additional kernel args
 # kernel_args=""

data/missing

@@ -1,10 +1,14 @@
-extra/python-appdirs
-extra/python-beaker
-extra/python-mako
-extra/python-markupsafe
-extra/python-packaging
-extra/python-pyparsing
+extra/python-crypto
+extra/python-nose
+extra/python-requests
+extra/python-urllib3
 
+extra/pygobject2-devel
+extra/python2-gobject2
+
+extra/perl-locale-gettext
+extra/help2man
+extra/autogen
 extra/libmp4v2
 extra/libmpdclient
 extra/audiofile
@@ -15,17 +19,13 @@ extra/sbc
 extra/enchant
 extra/chromaprint
 extra/ttf-liberation
-extra/ethtool
 extra/pygobject2-devel
 extra/python2-gobject2
 extra/faac
 extra/mjpegtools
 extra/mpg123
-extra/serf
 extra/tinycdb
 
-extra/js
-
 extra/speexdsp
 extra/spandsp
 extra/soundtouch
@@ -35,17 +35,12 @@ extra/appstream-glib
 extra/opencl-headers
 
 # openrc-world deps
-extra/metalog
-extra/clamav
-extra/lighttpd
 extra/dnsmasq
 extra/postgresql-libs
 extra/postfix
 extra/wicd
-extra/cyrus-sasl
 extra/mpd
 extra/bitlbee
 extra/bind
 extra/lirc
-extra/sane
 extra/transmission-cli

lib/util.sh

@@ -95,7 +95,7 @@ init_artools_iso(){
 
     [[ -z ${initsys} ]] && initsys="openrc"
 
-    [[ -z ${kernel} ]] && kernel="linux-lts"
+    [[ -z ${kernel} ]] && kernel="linux"
 
     [[ -z ${kernel_args} ]] && kernel_args=""