Commit b791c952c83d7bc79e14064289014e44d3f9296a
1 parent
5eb153a5
Exists in
develop
Adding help to bundle script.
Showing
2 changed files
with
43 additions
and
20 deletions
Show diff stats
win/bundle.common
| @@ -25,6 +25,37 @@ | @@ -25,6 +25,37 @@ | ||
| 25 | # http://drup.org/gtk-warning-error-loading-icon-couldnt-recognize-image-file-format | 25 | # http://drup.org/gtk-warning-error-loading-icon-couldnt-recognize-image-file-format |
| 26 | # | 26 | # |
| 27 | 27 | ||
| 28 | +# Check command-line arguments | ||
| 29 | +argument() { | ||
| 30 | + | ||
| 31 | + local cmdline | ||
| 32 | + for cmdline in ${BASH_ARGV[*]} | ||
| 33 | + do | ||
| 34 | + if [ "$(echo ${cmdline} | sed "s@^--@@g" | sed "s@^-@@g" | cut -d= -f1)" == "${1}" ]; then | ||
| 35 | + local value | ||
| 36 | + value="$(echo ${cmdline} | cut -d= -f2)" | ||
| 37 | + if [ -z "${value}" ]; then | ||
| 38 | + echo "1" | ||
| 39 | + else | ||
| 40 | + echo "${value}" | ||
| 41 | + fi | ||
| 42 | + return 0 | ||
| 43 | + fi | ||
| 44 | + done | ||
| 45 | + echo "" | ||
| 46 | + return 2 | ||
| 47 | +} | ||
| 48 | + | ||
| 49 | +argument "help" > /dev/null | ||
| 50 | +if [ "$?" == "0" ]; then | ||
| 51 | + echo "Use ${0} options" | ||
| 52 | + echo "" | ||
| 53 | + echo " --help Help options (this screen)" | ||
| 54 | + echo " --zip Build zipfile" | ||
| 55 | + echo " --nsi Build nsi installer" | ||
| 56 | + echo " --upload Upload bundle to github" | ||
| 57 | +fi | ||
| 58 | + | ||
| 28 | # Setup default paths | 59 | # Setup default paths |
| 29 | srcdir="$(dirname $(dirname $(readlink -f "${0}")))" | 60 | srcdir="$(dirname $(dirname $(readlink -f "${0}")))" |
| 30 | cd ${srcdir} | 61 | cd ${srcdir} |
| @@ -97,6 +128,12 @@ fi | @@ -97,6 +128,12 @@ fi | ||
| 97 | export LANG=C | 128 | export LANG=C |
| 98 | 129 | ||
| 99 | prepare() { | 130 | prepare() { |
| 131 | + | ||
| 132 | + argument "help" > /dev/null | ||
| 133 | + if [ "$?" == "0" ]; then | ||
| 134 | + exit 0 | ||
| 135 | + fi | ||
| 136 | + | ||
| 100 | rm -fr "${buildroot}" | 137 | rm -fr "${buildroot}" |
| 101 | mkdir -p "${buildroot}" | 138 | mkdir -p "${buildroot}" |
| 102 | } | 139 | } |
| @@ -350,26 +387,6 @@ install_loaders() { | @@ -350,26 +387,6 @@ install_loaders() { | ||
| 350 | 387 | ||
| 351 | } | 388 | } |
| 352 | 389 | ||
| 353 | -argument() { | ||
| 354 | - | ||
| 355 | - local cmdline | ||
| 356 | - for cmdline in ${BASH_ARGV[*]} | ||
| 357 | - do | ||
| 358 | - if [ "$(echo ${cmdline} | sed "s@^--@@g" | sed "s@^-@@g" | cut -d= -f1)" == "${1}" ]; then | ||
| 359 | - local value | ||
| 360 | - value="$(echo ${cmdline} | cut -d= -f2)" | ||
| 361 | - if [ -z "${value}" ]; then | ||
| 362 | - echo "1" | ||
| 363 | - else | ||
| 364 | - echo "${value}" | ||
| 365 | - fi | ||
| 366 | - return 0 | ||
| 367 | - fi | ||
| 368 | - done | ||
| 369 | - echo "" | ||
| 370 | - return 2 | ||
| 371 | -} | ||
| 372 | - | ||
| 373 | make_zip() { | 390 | make_zip() { |
| 374 | 391 | ||
| 375 | cd ${buildroot}${MINGW_PREFIX} | 392 | cd ${buildroot}${MINGW_PREFIX} |
win/bundle.cross
| @@ -33,6 +33,12 @@ REPOSITORY_NAME="pw3270" | @@ -33,6 +33,12 @@ REPOSITORY_NAME="pw3270" | ||
| 33 | # Load bundle functions | 33 | # Load bundle functions |
| 34 | . "$(dirname $(readlink -f "${0}"))/bundle.common" | 34 | . "$(dirname $(readlink -f "${0}"))/bundle.common" |
| 35 | 35 | ||
| 36 | +argument "help" > /dev/null | ||
| 37 | +if [ "$?" == "0" ]; then | ||
| 38 | + echo " --install-requires Install required packages" | ||
| 39 | + echo " --build Build application from source" | ||
| 40 | +fi | ||
| 41 | + | ||
| 36 | prepare | 42 | prepare |
| 37 | 43 | ||
| 38 | # List of pre-req packages | 44 | # List of pre-req packages |