diff options
| author | Linus Nordberg <linus@nordu.net> | 2015-08-25 06:35:19 +0200 | 
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2015-08-25 06:35:19 +0200 | 
| commit | 4e16f940beb6d47e516b92696c0007f0f9891af8 (patch) | |
| tree | 0fb3329cc7f5e6ef6d8535fb6f491798b1f81896 | |
| parent | 741bf2d54808450627f84e20fc86b85d3baa6d83 (diff) | |
Fix a typo in ERL_LIBS path to plop.
Also, handle lager like catlfish and plop, i.e. find out its version
number instead of using a static string.
| -rwxr-xr-x | catlfish-dev/start.sh | 11 | 
1 files changed, 6 insertions, 5 deletions
| diff --git a/catlfish-dev/start.sh b/catlfish-dev/start.sh index 22030bb..bf7b129 100755 --- a/catlfish-dev/start.sh +++ b/catlfish-dev/start.sh @@ -33,15 +33,16 @@ case $role in          ;;      merge) -        # Catlfish and plop versions are included in filename of +        # Module versions are included in the filename of the module          # archive file and in the filename within the -        # archive. Example: lib/catlfish-0.6.0.ez contains -        # catlfish-0.6.0. +        # archive. Example: lib/catlfish-0.8.0-dev.ez contains +        # catlfish-0.8.0-dev.          ver=$(ls $erlbase/lib/catlfish-*.ez | sed 's/.*catlfish-\(.*\)\.ez/\1/1')          ERL_LIBS=$erlbase/lib/catlfish-${ver}.ez/catlfish-${ver}          ver=$(ls $erlbase/lib/plop-*.ez | sed 's/.*plop-\(.*\)\.ez/\1/1') -        ERL_LIBS=$ERL_LIBS:$erlbase/lib/plop-${ver}.ez/plop-${ver}/ebin -        ERL_LIBS=$ERL_LIBS:$erlbase/lib/lager-2.1.1.ez/lager-2.1.1 +        ERL_LIBS=$ERL_LIBS:$erlbase/lib/plop-${ver}.ez/plop-${ver} +        ver=$(ls $erlbase/lib/lager-*.ez | sed 's/.*lager-\(.*\)\.ez/\1/1') +        ERL_LIBS=$ERL_LIBS:$erlbase/lib/lager-${ver}.ez/lager-${ver}          export ERL_LIBS  	[ -z "${MERGE_DB_DIR}" ] && MERGE_DB_DIR=merge-db | 
