From 8936656efea31724ec5ba681f3cb7f6115d102c0 Mon Sep 17 00:00:00 2001 From: rhatto Date: Thu, 11 Jan 2007 15:55:03 +0000 Subject: simplaret: changed -basename-only, -filename-only and -formatted to --basename-only, --filename-only and --formatted on simplaret_show_package git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@91 04377dda-e619-0410-9926-eae83683ac58 --- src/simplaret | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/simplaret b/src/simplaret index 842878c..d307726 100755 --- a/src/simplaret +++ b/src/simplaret @@ -239,13 +239,13 @@ function simplaret_find_package { function simplaret_show_package { # print a package result - # usage: simplaret_show_package [-basename-only|-filename-only|-formatted] + # usage: simplaret_show_package [--basename-only|--filename-only|--formatted] - if [ "$2" == "-basename-only" ]; then + if [ "$2" == "--basename-only" ]; then echo `basename $1` - elif [ "$2" == "-filename-only" ]; then + elif [ "$2" == "--filename-only" ]; then echo $1 - elif [ "$2" == "-formatted" ]; then + elif [ "$2" == "--formatted" ]; then echo $1,$repos_type,$repository else if echo $1 | grep -q "/patches/"; then @@ -393,7 +393,7 @@ function simplaret_get { candidate="`basename $file`" if [ "`package_name $candidate`" == "$1" ]; then # check if has the same version and build number, otherwise erase the old one - for result in `simplaret_search $(package_name $candidate) -basename-only`; do + for result in `simplaret_search $(package_name $candidate) --basename-only`; do if [ "`package_name $candidate`" == "`package_name $result`" ] && \ [ "`package_version $candidate`" == "`package_version $result`" ] && \ [ "`package_build $candidate`" == "`package_build $result`" ]; then @@ -413,7 +413,7 @@ function simplaret_get { done # then search for the package in the repositories - for result in `simplaret_search $1 -formatted`; do + for result in `simplaret_search $1 --formatted`; do file="`echo $result | cut -d , -f 1`" repos_type="`echo $result | cut -d , -f 2`" @@ -521,16 +521,16 @@ function simplaret_get_jail_patches { echo fetching patches for arch $ARCH and version $VERSION for jail $root # list all available patches in PATCHES repositories - for sugested in `simplaret_search -formatted | grep patches`; do + for sugested in `simplaret_search --formatted | grep patches`; do simplaret_search_and_download_patch done # grab patches from every other places if [ "$CONSIDER_ALL_PACKAGES_AS_PATCHES" == "1" ]; then - # TODO: for sugested in `simplaret_search -formatted`; do + # TODO: for sugested in `simplaret_search --formatted`; do # and also think yet some more about this scheme... does ROOT/patches # should be dealed as a PATCHES repository? - for sugested in `simplaret_search patches -formatted | grep -v patches`; do + for sugested in `simplaret_search patches --formatted | grep -v patches`; do simplaret_search_and_download_patch done fi -- cgit v1.2.3