diff options
| -rwxr-xr-x | bin/app-upgrade | 2 | ||||
| -rwxr-xr-x | libexec/app-resolver-file | 2 | ||||
| -rwxr-xr-x | test/app-upgrade.bats | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/bin/app-upgrade b/bin/app-upgrade index 2ca84e0..c6cd414 100755 --- a/bin/app-upgrade +++ b/bin/app-upgrade @@ -25,7 +25,7 @@ resolver=`find_resolver "$resolver_name"` old_version=`app-conf get app.version` echo "Resolving version $old_version" "$resolver" resolve-version -new_version=`app-conf get app.version` +new_version=`app-conf get app.resolved_version` if [[ $new_version == $old_version ]] then diff --git a/libexec/app-resolver-file b/libexec/app-resolver-file index b41ca47..500b3a0 100755 --- a/libexec/app-resolver-file +++ b/libexec/app-resolver-file @@ -71,7 +71,7 @@ download_version() { path=$(app-conf get file.path) - ln -s "$path" "$target" + ln -f -s "$path" "$target" } command="$1"; shift diff --git a/test/app-upgrade.bats b/test/app-upgrade.bats index 2dde851..5d79260 100755 --- a/test/app-upgrade.bats +++ b/test/app-upgrade.bats @@ -14,17 +14,18 @@ load utils app conf get maven.version match '${lines[0]}' "1.0-SNAPSHOT" maven_version="${lines[0]}" - describe maven_version=$maven_version app conf get app.version match '${lines[0]}' "1.0-.*" app_version="${lines[0]}" - describe app_version=$app_version app conf get app.resolved_version match '${lines[0]}' "1.0-.*" eq '${lines[0]}' "$app_version" resolved_version="${lines[0]}" + + describe maven_version=$maven_version + describe app_version=$app_version describe resolved_version=$resolved_version install_artifact |