From: Martin Logan <[EMAIL PROTECTED]>
---
bin/epkg | 7 ++++---
bin/faxien | 6 ++----
lib/epkg/src/epkg.erl | 16 +++++++++++++---
lib/epkg/src/epkg_install.erl | 2 +-
4 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/bin/epkg b/bin/epkg
index 86b477b..cbaa93e 100644
--- a/bin/epkg
+++ b/bin/epkg
@@ -11,10 +11,11 @@ ERTS_VSN=5.6.3
INVOCATION_SUFFIX="-s epkg cmdln_apply epkg $@ -noshell -prefix $PREFIX"
###########################################
-ROOTDIR=$PREFIX/packages/$ERTS_VSN
-ERTS_DIR=$ROOTDIR/erts-$ERTS_VSN
-export $ROOTDIR
+export ROOTDIR=$PREFIX/application_packages/$ERTS_VSN
+#export ROOTDIR=$PREFIX/packages/$ERTS_VSN
+ERTS_DIR=$PREFIX/erts_packages/erts-$ERTS_VSN
+#ERTS_DIR=$ROOTDIR/erts-$ERTS_VSN
export BINDIR=$ERTS_DIR/bin
export EMU=beam
export PROGNAME=erl
diff --git a/bin/faxien b/bin/faxien
index 292b522..1cc20b0 100644
--- a/bin/faxien
+++ b/bin/faxien
@@ -12,10 +12,8 @@ INVOCATION_SUFFIX="-s faxien cmdln_apply faxien $@ -noshell
-prefix $PREFIX"
###########################################
-export ROOTDIR=$PREFIX/application_packages/$ERTS_VSN
-#export ROOTDIR=$PREFIX/packages/$ERTS_VSN
-ERTS_DIR=$PREFIX/erts_packages/erts-$ERTS_VSN
-#ERTS_DIR=$ROOTDIR/erts-$ERTS_VSN
+export ROOTDIR=$PREFIX/packages/$ERTS_VSN
+ERTS_DIR=$ROOTDIR/erts-$ERTS_VSN
export BINDIR=$ERTS_DIR/bin
export EMU=beam
export PROGNAME=erl
diff --git a/lib/epkg/src/epkg.erl b/lib/epkg/src/epkg.erl
index b44118b..4917310 100644
--- a/lib/epkg/src/epkg.erl
+++ b/lib/epkg/src/epkg.erl
@@ -224,7 +224,12 @@ list_lib() ->
{ok, TargetErtsVsn} = gas:get_env(epkg, target_erts_vsn,
ewr_util:erts_version()),
Series = epkg_util:all_erts_vsns(TargetErtsVsn),
NameVsnsPairs =
collect_dups(epkg_manage:list_lib(InstallationPath, Series)),
- io:format("~nInstalled Applications for ERTS versions between ~s and
~s:~n", [hd(Series), hd(lists:reverse(Series))]),
+ case Series of
+ [TargetErtsVsn, HighErtsVsn|_] ->
+ io:format("~nInstalled Applications for ERTS versions between ~s
and ~s:~n", [TargetErtsVsn, HighErtsVsn]);
+ _ ->
+ io:format("~nInstalled Applications:~n")
+ end,
print_installed(NameVsnsPairs).
%%--------------------------------------------------------------------
@@ -238,8 +243,13 @@ list_releases() ->
{ok, TargetErtsVsn} = gas:get_env(epkg, target_erts_vsn,
ewr_util:erts_version()),
Series = epkg_util:all_erts_vsns(TargetErtsVsn),
NameVsnsPairs =
collect_dups(epkg_manage:list_releases(InstallationPath, Series)),
- io:format("~nInstalled Releases (Erlang standalone services) for ERTS
versions between ~s and ~s:~n",
- [hd(Series), hd(lists:reverse(Series))]),
+ case Series of
+ [TargetErtsVsn, HighErtsVsn|_] ->
+ io:format("~nInstalled Releases (Erlang standalone services) for
ERTS versions between ~s and ~s:~n",
+ [TargetErtsVsn, HighErtsVsn]);
+ _ ->
+ io:format("~nInstalled Releases (Erlang standalone services):~n")
+ end,
print_installed(NameVsnsPairs).
%%--------------------------------------------------------------------
diff --git a/lib/epkg/src/epkg_install.erl b/lib/epkg/src/epkg_install.erl
index 49dca06..87b3cd4 100644
--- a/lib/epkg/src/epkg_install.erl
+++ b/lib/epkg/src/epkg_install.erl
@@ -236,7 +236,7 @@ execute_release_installation_steps(ReleasePackageDirPath,
InstallationPath, IsLo
catch
Class:Exception = {badmatch, ActualError} ->
?ERROR_MSG("Caught exception ~p of class ~p ~p~n", [Exception,
Class, erlang:get_stacktrace()]),
- {error, ActualError};
+ ActualError;
Class:Exception ->
?ERROR_MSG("Caught exception ~p of class ~p ~p~n", [Exception,
Class, erlang:get_stacktrace()]),
{error, Exception}
--
1.5.3.5
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"erlware-dev" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/erlware-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
