aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2006-12-09 13:56:44 +0000
committerrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2006-12-09 13:56:44 +0000
commitdd5b5163e916f5cd7d309b4e351ba693f1e5c3ec (patch)
tree10771b78c06a98dbd7f3eb4c2e6ada944bce6c65
parentc3553938395c02bca31251a0ca2b37eb8456e4f1 (diff)
downloadsimplepkg-dd5b5163e916f5cd7d309b4e351ba693f1e5c3ec.tar.gz
simplepkg-dd5b5163e916f5cd7d309b4e351ba693f1e5c3ec.tar.bz2
simplaret: small fix
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@46 04377dda-e619-0410-9926-eae83683ac58
-rwxr-xr-xsrc/simplaret19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/simplaret b/src/simplaret
index a0e2a83..4813e2a 100755
--- a/src/simplaret
+++ b/src/simplaret
@@ -92,7 +92,7 @@ function simplaret_check_index {
function simplaret_download {
# downloads a file from a repo to a folder
- # usage: simplaret <repos_url> <package> <destination-folder>
+ # usage: simplaret <repository_url> <package> <destination-folder>
protocol="`echo $1 | cut -d : -f 1`"
@@ -164,7 +164,7 @@ function simplaret_repository_url {
if echo $repository | grep -qe %; then
repository_url="`echo $repository | cut -d % -f 2`"
- if [ -z "$repos_url" ]; then
+ if [ -z "$repository_url" ]; then
echo you should set a url for the repository $repository
echo please correct your $REPOS_CONF
exit 1
@@ -259,7 +259,7 @@ function simplaret_show_package {
function simplaret_search {
- local priority
+ local priority message
for repos_type in patches root repos noarch; do
@@ -272,8 +272,12 @@ function simplaret_search {
if [ ! -f "$storage/$repository_name/FILELIST.TXT" ]; then
if [ "$WARNING" != "0" ] || [ ! -z "$SILENT" ]; then
- # TODO: message should also work for noarch repositories
- echo warning: no file list for $repository_name repository $repository_name on arch $ARCH version $VERSION
+ if [ "$repos_type" == "noarch" ]; then
+ message=""
+ else
+ message="on arch $ARCH version $VERSION"
+ fi
+ echo warning: no file list for $repository_name repository $repository_name $message
echo please do a simplaret --update
fi
else
@@ -339,8 +343,7 @@ function simplaret_purge {
function simplaret_get {
- # TODO: with no parameters, update the existing packages at the local repo?
- # support to --get package-version-arch-build.tgz or just half the name
+ # TODO: support to --get package-version-arch-build.tgz or just part of the name
# first search for an already downloaded package
for repos_type in patches root repos noarch; do
@@ -397,6 +400,7 @@ function simplaret_get {
function simplaret_get_patches {
# TODO: new format
+ # use /etc/simplepkg/jailist
if [ ! -d "$PATCHES_DIR/$ARCH/$VERSION" ]; then
mkdir -p $PATCHES_DIR/$ARCH/$VERSION
@@ -463,7 +467,6 @@ if [ -z "$1" ]; then
simplaret_usage
exit 1
else
- server="$1"
eval_config `basename $0`
simplaret_eval_config
fi