From 989edff55111db3b457c9e04f3abf296e6ac555c Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sun, 20 Oct 2013 21:55:01 +0200
Subject: o Getting "upgrade" to work with non-SNAPSHOT versions too. o
 Removing maven.version. o Documenting(!) the different configuration keys and
 what they mean.

---
 libexec/app-resolver-maven | 8 ++++----
 libexec/app-set-version    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'libexec')

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"
-- 
cgit v1.2.3