aboutsummaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2013-10-20 21:55:01 +0200
committerTrygve Laugstøl <trygvis@inamo.no>2013-10-20 22:01:26 +0200
commit989edff55111db3b457c9e04f3abf296e6ac555c (patch)
treeeb9bf0b99b7ed10a05c90a597d57e5c0e543c36d /libexec
parenta6ad0dd211ba4a394d70dd13d3375118b6e5f27a (diff)
downloadapp.sh-989edff55111db3b457c9e04f3abf296e6ac555c.tar.gz
app.sh-989edff55111db3b457c9e04f3abf296e6ac555c.tar.bz2
app.sh-989edff55111db3b457c9e04f3abf296e6ac555c.tar.xz
app.sh-989edff55111db3b457c9e04f3abf296e6ac555c.zip
o Getting "upgrade" to work with non-SNAPSHOT versions too.
o Removing maven.version. o Documenting(!) the different configuration keys and what they mean.
Diffstat (limited to 'libexec')
-rwxr-xr-xlibexec/app-resolver-maven8
-rwxr-xr-xlibexec/app-set-version2
2 files changed, 5 insertions, 5 deletions
diff --git a/libexec/app-resolver-maven b/libexec/app-resolver-maven
index 5af7596..25f7242 100755
--- a/libexec/app-resolver-maven
+++ b/libexec/app-resolver-maven
@@ -84,7 +84,7 @@ download_artifact() {
resolve_version() {
local group_id=`app-conf get maven.group_id`
local artifact_id=`app-conf get maven.artifact_id`
- local version=`app-conf get maven.version`
+ local version=`app-conf get app.version`
repo=`app-conf get maven.repo`
@@ -131,7 +131,7 @@ resolve_snapshot() {
exit 1
fi
- app-conf set maven.snapshotVersion "$snapshot_version"
+ app-conf set maven.snapshot "$snapshot_version"
app-conf set app.resolved_version "${version%-SNAPSHOT}-$snapshot_version"
}
@@ -161,7 +161,7 @@ download_version() {
repo=`app-conf get maven.repo`
group_id=`app-conf get maven.group_id`
artifact_id=`app-conf get maven.artifact_id`
- version=`app-conf get maven.version`
+ version=`app-conf get app.version`
group_id_slash=`slash $group_id`
base_path=$group_id_slash/$artifact_id/$version
@@ -209,7 +209,7 @@ init() {
app-conf set maven.group_id "$group_id"
app-conf set maven.artifact_id "$artifact_id"
- app-conf set maven.version "$version"
+ app-conf set app.version "$version"
}
command="$1"; shift
diff --git a/libexec/app-set-version b/libexec/app-set-version
index 0abb9b8..1b7fd16 100755
--- a/libexec/app-set-version
+++ b/libexec/app-set-version
@@ -54,4 +54,4 @@ else
ln -s versions/$version/root current
fi
-app-conf set app.version "$version"
+app-conf set app.installed_version "$version"