diff options
author | makefu <github@syntax-fehler.de> | 2011-09-12 14:54:35 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2011-09-12 14:54:35 +0200 |
commit | 89d92c55e7ddc0aec61ae8210592410f37f73502 (patch) | |
tree | f4e37228cdc5cdf166dee93e959a207845d86af7 | |
parent | 9f70f9b5b462aa3e150b9708f695edfaf716edd4 (diff) |
punani: fix parsing bug, add fallback helper
-rwxr-xr-x | punani/bin/punani | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/punani/bin/punani b/punani/bin/punani index f9244c53..1dd72542 100755 --- a/punani/bin/punani +++ b/punani/bin/punani @@ -31,7 +31,8 @@ guess_system() } arch_aur_helper() { - manager="yaourt clyde packer bauerbill tupac pacaur paktahn pbfetch aurget aurora cower powaur" + # pacman is the last fallback helper + manager="yaourt clyde packer bauerbill tupac pacaur paktahn pbfetch aurget aurora cower powaur pacman" for i in $manager;do mgr=`which $i` if [ "$mgr" ] ;then @@ -39,8 +40,7 @@ arch_aur_helper() return 0 fi done - echo "!! no aur helper found" - echo "!! To be Implemented" + echo "!! no helper found, this should never happen(tm)." return 1 } handle_system () { @@ -64,6 +64,14 @@ handle_system () { pacman -Sy pkgtool -u } + punani_Scientist_search() { + pkgfile $1 + if [ "${hard-}" ] ; then + mgr=`arch_aur_helper` + $mgr -Ss $1 + fi + + } punani_Engineer_insert() { # punani under archlinux first tries to load the packages with the given file name @@ -71,7 +79,7 @@ handle_system () { # # when trying harder it tries to load the package with the given name directly via yaourt echo "** trying to find package with given file" - if pacman -Sy `pkgfile $1`; then + if pacman -S `pkgfile $1` 2>/dev/null; then echo "++ finished" exit 0 else @@ -182,7 +190,7 @@ EOF punani (){ ns=punani role=undefined - while getopts 'dfhvSopEir' OPT; do + while getopts 'dfhvSsopEir' OPT; do case $OPT in (f) force=true; continue;; (h) hard=true; continue;; @@ -237,7 +245,6 @@ guess_system handle_system -command="${ns}_Engineer_insert" for name; do "$command" "$name" done |