diff options
| author | Otavio Salvador <otavio@debian.org> | 2007-10-08 09:17:45 -0300 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:22:27 +0100 |
| commit | 3574ac40be1cbd11fa0610352f921976b254ccea (patch) | |
| tree | dd9cdd446942bb4d21af86429d81bd2e2f2504ca | |
| parent | 91d3e8b55cf7da604000d016f26e6bd0fa0d682e (diff) | |
| download | vyos-live-build-3574ac40be1cbd11fa0610352f921976b254ccea.tar.gz vyos-live-build-3574ac40be1cbd11fa0610352f921976b254ccea.zip | |
fix version guessing using proper evaluation
| -rwxr-xr-x | helpers/lh_binary_disk | 2 | ||||
| -rwxr-xr-x | helpers/lh_binary_includes | 2 | ||||
| -rwxr-xr-x | helpers/lh_source_disk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk index 26905e6cd..e03b0fb14 100755 --- a/helpers/lh_binary_disk +++ b/helpers/lh_binary_disk @@ -57,7 +57,7 @@ mkdir -p binary/.disk ARCHITECTURE="$(echo ${LH_ARCHITECTURE} | sed -e 's# #/#g')" DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')" DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)" -eval VERSION="$$(echo VERSION_${LH_DISTRIBUTION})" +eval VERSION="$`echo VERSION_${LH_DISTRIBUTION}`" if [ "${LH_DISTRIBUTION}" != "etch" ] then diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes index e90716ba2..b4230a85d 100755 --- a/helpers/lh_binary_includes +++ b/helpers/lh_binary_includes @@ -136,7 +136,7 @@ then ARCHITECTURE="$(echo ${LH_ARCHITECTURE} | sed -e 's# #/#g')" DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')" DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)" - eval VERSION="$$(echo VERSION_${LH_DISTRIBUTION})" + eval VERSION="$`echo VERSION_${LH_DISTRIBUTION}`" if [ -d binary/pool/main/l/live-installer ] then diff --git a/helpers/lh_source_disk b/helpers/lh_source_disk index 3b7a95ac7..b744a8a54 100755 --- a/helpers/lh_source_disk +++ b/helpers/lh_source_disk @@ -57,7 +57,7 @@ mkdir -p source/.disk ARCHITECTURE="$(echo ${LH_ARCHITECTURE} | sed -e 's# #/#g')" DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')" DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)" -eval VERSION="$$(echo VERSION_${LH_DISTRIBUTION})" +eval VERSION="$`echo VERSION_${LH_DISTRIBUTION}`" case "${LH_MODE}" in debian) |