diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2013-05-23 02:17:10 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2013-05-23 02:17:10 +0530 |
| commit | 8032cdc23535bbee7edd296fef119cf7c06e6339 (patch) | |
| tree | 2b4b02a1d6d63164ccf3b48c029bac03e681494b /build-scripts | |
| parent | afdea3d9ef9f77ccca5071daf2d8bf0248255689 (diff) | |
create-user-build-script: some more clean-up
Diffstat (limited to 'build-scripts')
| -rwxr-xr-x | build-scripts/create-user-build-script | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/build-scripts/create-user-build-script b/build-scripts/create-user-build-script index 5beedea..2a58ecb 100755 --- a/build-scripts/create-user-build-script +++ b/build-scripts/create-user-build-script @@ -51,6 +51,14 @@ usage() exit 1 } +install_package() +{ + if [ \`dpkg-query -W -f='\${Status}\n' \${1} 2>&1 | grep '^install ok' | wc -l\` -eq 0 ]; then + echo "Installing \${1}..." + sudo apt-get install \${1} + fi +} + while getopts "${USAGE_OPTOVERLAY}d:l:ht" optn; do case \$optn in $USAGE_OPTHANDLER @@ -71,17 +79,13 @@ else fi echo if [[ \${UBUNTU} =~ "13." || \${UBUNTU} =~ "12.10" ]]; then - if [ \`dpkg-query -W -f='\${Status}\n' software-properties-common 2>&1 | grep '^install ok' | wc -l\` -eq 0 ]; then - echo "Installing missing base dependency: software-properties-common" - sudo apt-get install software-properties-common - fi + #Install basic dev package missing in chrooted environments + install_package software-properties-common sudo dpkg --add-architecture i386 PKGS+=' libstdc++6:i386 git-core' elif [[ \${UBUNTU} =~ "12.04" || \${UBUNTU} =~ "10.04" ]] ; then - if [ \`dpkg-query -W -f='\${Status}\n' python-software-properties 2>&1 | grep '^install ok' | wc -l\` -eq 0 ] ; then - echo "Installing missing base dependency: python-software-properties" - sudo apt-get install python-software-properties - fi + #Install basic dev package missing in chrooted environments + install_package python-software-properties if [[ \${UBUNTU} =~ "12.04" ]]; then PKGS+=' libstdc++6:i386 git-core' else |