aboutsummaryrefslogtreecommitdiff
path: root/lib/common
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2013-11-01 15:48:58 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2013-11-01 19:58:08 +0100
commit93e2978fbe5582440d79c47b5975659d9cbf701b (patch)
treebd768e4202b8a5a2cda3a9b40e638bfcd610d65c /lib/common
parent1480338c5a3da5b6494565ab955ab67a15f19dd3 (diff)
downloadapp.sh-93e2978fbe5582440d79c47b5975659d9cbf701b.tar.gz
app.sh-93e2978fbe5582440d79c47b5975659d9cbf701b.tar.bz2
app.sh-93e2978fbe5582440d79c47b5975659d9cbf701b.tar.xz
app.sh-93e2978fbe5582440d79c47b5975659d9cbf701b.zip
lib/common: Changing run_app to not check for a 'current' link if
version is given. This will unbreak hooks that are run before a current link is installed or if it has been removed.
Diffstat (limited to 'lib/common')
-rwxr-xr-xlib/common9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/common b/lib/common
index 369f0be..c2babd2 100755
--- a/lib/common
+++ b/lib/common
@@ -2,6 +2,7 @@
# Asserts that the cwd is an app directory.
# By default it checks that there is a 'current' link.
+# TODO: make check_link default to no if version is set
assert_is_app() {
local check_link=yes
local version=
@@ -241,8 +242,8 @@ run_app() {
case $opt in
v)
version=$OPTARG
- shift 2
- OPTIND=1
+ shift 2
+ OPTIND=1
;;
esac
done
@@ -258,13 +259,13 @@ run_app() {
assert_is_app
cd current
else
- assert_is_app -v "$version"
+ assert_is_app -C -v "$version"
cd "versions/$version"
fi
path=/bin:/usr/bin
- # This magically get the expansion of $u correct.
+ # This will magically get the expansion of $u correct.
IFS="
"