diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2013-04-20 21:26:52 +0200 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2013-04-20 21:26:52 +0200 |
| commit | 875716dc48cd5c485d2342c9e5bb1d461bc64b6d (patch) | |
| tree | e8429406bfb43f593008375b673c6669c72f32f2 /bin/app-init | |
| parent | 32826f3c989e63f53510a9bdccd1855a9ae00636 (diff) | |
| download | app.sh-875716dc48cd5c485d2342c9e5bb1d461bc64b6d.tar.gz app.sh-875716dc48cd5c485d2342c9e5bb1d461bc64b6d.tar.bz2 app.sh-875716dc48cd5c485d2342c9e5bb1d461bc64b6d.tar.xz app.sh-875716dc48cd5c485d2342c9e5bb1d461bc64b6d.zip | |
o Making the resolvers use app.resolved_version instead of app.version.
o Making set-version update app.version.
Diffstat (limited to 'bin/app-init')
| -rwxr-xr-x | bin/app-init | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/app-init b/bin/app-init index c59ba77..8e571e8 100755 --- a/bin/app-init +++ b/bin/app-init @@ -40,7 +40,7 @@ then fatal "Already initialized: $dir" 2>&1 fi -resolver=`grep_path "/app-resolver-$resolver_name$" "$PATH" | head -n 1` +resolver=`find_resolver "$resolver_name"` if [ -z "$resolver" ] then @@ -61,18 +61,18 @@ app-conf set app.resolver "$resolver_name" "$resolver" init "$@" "$resolver" resolve-version -version=`app-conf get app.version` +resolved_version=`app-conf get app.resolved_version` -if [[ $version == "" ]] +if [[ $resolved_version == "" ]] then echo "Unable to resolve version" 2>&1 exit fi -echo "Resolved version to $version" +echo "Resolved version to $resolved_version" -"$resolver" download-version -v "$version" -f .app/latest.zip +"$resolver" download-version -v "$resolved_version" -f .app/latest.zip -app-install-file -v "$version" -f .app/latest.zip +app-install-file -v "$resolved_version" -f .app/latest.zip ok=yes |