summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2008-07-09 22:13:17 +0200
committerDaniel Friesel <derf@derf.homelinux.org>2008-07-09 22:13:17 +0200
commitab2ca24afcc319b62eb2845099633cc7205efb0d (patch)
tree817d5af6d41c3b67b413ea2edab415d7b2932dd7
parentab9f94977b481af0ba80150e475fad2ad9e98a06 (diff)
bin/pkg: Use $var instead of "$var"
-rwxr-xr-xbin/pkg90
1 files changed, 45 insertions, 45 deletions
diff --git a/bin/pkg b/bin/pkg
index 531b74a..b0fd3c2 100755
--- a/bin/pkg
+++ b/bin/pkg
@@ -203,7 +203,7 @@ list_remote_version () {
# Return an understandable priority from the numeric one
real_priority () {
- case "$1" in
+ case $1 in
6) echo "essential" ;;
5) echo "important" ;;
4) echo "required" ;;
@@ -216,8 +216,8 @@ real_priority () {
# Execute a hook
exec_hook () {
- package="$1"
- hook="$2"
+ package=$1
+ hook=$2
if [[ -r $PDIR/$package/hooks/$hook ]] {
info "Executing $hook hook\n"
cd $PDIR/$package
@@ -237,10 +237,10 @@ check_deps () {
}
if [[ -n "$INSTALL" ]] {
info "$1 has unmet dependencies: "
- echo "$INSTALL"
+ echo $INSTALL
if (confirm_yes "Install dependencies?") {
for pkg in $INSTALL; {
- pkg_add "$pkg"
+ pkg_add $pkg
}
}
}
@@ -252,15 +252,15 @@ check_conflicts () {
REMOVE=()
for conflict in $CONFLICTS; {
if [[ -d $PDIR/$conflict ]] {
- REMOVE+="$conflict"
+ REMOVE+=$conflict
}
}
- if [[ -n "$REMOVE" ]] {
+ if [[ -n $REMOVE ]] {
info "$1 conflicts with the following packages: "
- echo "$REMOVE"
+ echo $REMOVE
if (confirm_no "Remove conflicting packages and proceed with installation?") {
for pkg in $REMOVE; {
- pkg_remove "$pkg"
+ pkg_remove $pkg
}
} else {
die "Installation aborted"
@@ -299,7 +299,7 @@ populate_collected () {
if [[ -d bin ]] {
for i in bin/*(*); {
if [[ "$(readlink $HOME/$i)" != "../$1/$i" ]] {
- rm -f "$HOME/$i"
+ rm -f $HOME/$i
ln -s ../${PDIR//$HOME\/}/$1/$i $HOME/$i
}
}
@@ -379,7 +379,7 @@ pkg_remove () {
}
pkg_upgrade () {
- check_installed "$1"
+ check_installed $1
cd $PDIR/$1
info "Looking for updates: $1"
# TODO remove legacy
@@ -405,12 +405,12 @@ pkg_upgrade () {
# If no package was specified, update everything
pkg_upgrade_wrapper () {
- if [[ -n "$1" ]] {
- pkg_upgrade "$1"
+ if [[ -n $1 ]] {
+ pkg_upgrade $1
} else {
cd $PDIR
for i in *(/); {
- pkg_upgrade "$i"
+ pkg_upgrade $i
}
}
}
@@ -434,21 +434,21 @@ pkg_list_available () {
}
pkg_status () {
- check_installed "$1"
+ check_installed $1
cd $PDIR/$1
- check_deps "$1"
- check_conflicts "$1"
+ check_deps $1
+ check_conflicts $1
checklinks $CL_OPTIONS
}
# Same as with update - if no package is specified, check all
pkg_status_wrapper () {
- if [[ -n "$1" ]] {
- pkg_status "$1"
+ if [[ -n $1 ]] {
+ pkg_status $1
} else {
cd $PDIR
for i in *(/); {
- pkg_status "$i"
+ pkg_status $i
}
}
}
@@ -475,7 +475,7 @@ pkg_info () {
cd $PDIR
# Fetch the infos
- NAME="$1"
+ NAME=$1
LOCAL_VERSION=$(list_local_version $1)
REMOTE_VERSION=$(list_remote_version $1)
REPO_TYPE=$(list_type $1)
@@ -504,25 +504,25 @@ pkg_info () {
}
show_info () {
- [[ -z "$2" ]] && return
+ [[ -z $2 ]] && return
info "$1: "
- echo "$2"
+ echo $2
}
- show_info "Package" "$NAME"
+ show_info "Package" $NAME
show_info "Priority" "$PRIORITY ($PRIORITY_NAME)"
- show_info "Local Version" "$LOCAL_VERSION"
- show_info "Remote Version" "$REMOTE_VERSION"
- show_info "Repository Type" "$REPO_TYPE"
- show_info "Repostiry Size" "$SIZE"
- show_info "Depends" "$DEPENDENCIES"
- show_info "Tags" "$TAGS"
- show_info "Hooks" "$HOOKS"
- show_info "Description" "$DESCRIPTION"
+ show_info "Local Version" $LOCAL_VERSION
+ show_info "Remote Version" $REMOTE_VERSION
+ show_info "Repository Type" $REPO_TYPE
+ show_info "Repostiry Size" $SIZE
+ show_info "Depends" $DEPENDENCIES
+ show_info "Tags" $TAGS
+ show_info "Hooks" $HOOKS
+ show_info "Description" $DESCRIPTION
}
pkg_log () {
- check_installed "$1"
+ check_installed $1
cd $PDIR/$1
vcs_log
}
@@ -547,22 +547,22 @@ pkg_doc () {
## Now what shall we do...
##
-case "$1" in
- add) pkg_add "$2" ;;
- changelog) pkg_changelog "$2" ;;
- changeroot) pkg_changesrc "$2" ;;
- delete) pkg_remove "$2" ;;
- doc) pkg_doc "$2" ;;
- info) pkg_info "$2" ;;
- install) pkg_add "$2" ;;
+case $1 in
+ add) pkg_add $2 ;;
+ changelog) pkg_changelog $2 ;;
+ changeroot) pkg_changesrc $2 ;;
+ delete) pkg_remove $2 ;;
+ doc) pkg_doc $2 ;;
+ info) pkg_info $2 ;;
+ install) pkg_add $2 ;;
list) pkg_list_installed ;;
list-all) pkg_list_available ;;
local-update) pkg_update_local ;;
- log) pkg_log "$2" ;;
+ log) pkg_log $2 ;;
remote-update) pkg_update_remote ;;
- remove) pkg_remove "$2" ;;
- status) pkg_status_wrapper "$2" ;;
+ remove) pkg_remove $2 ;;
+ status) pkg_status_wrapper $2 ;;
update) pkg_update ;;
- upgrade) pkg_upgrade_wrapper "$2" ;;
+ upgrade) pkg_upgrade_wrapper $2 ;;
*) die "wait, what?\n" ;;
esac