diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-10-27 17:58:50 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-10-29 12:44:05 -0300 |
| commit | a9b4e2bbf9f6c8712d2d814d01165ad06481d4cc (patch) | |
| tree | 5172b21b939194a2ab4069c592bed41b23112a40 /createbundle.sh | |
| parent | bb67f3f2761451dceefc5648f750d61b01fe8daa (diff) | |
Add checks for mandatory files.
Also factor out bundler arguments.
Diffstat (limited to 'createbundle.sh')
| -rwxr-xr-x | createbundle.sh | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/createbundle.sh b/createbundle.sh index 4d4dfbe..1336263 100755 --- a/createbundle.sh +++ b/createbundle.sh @@ -40,6 +40,11 @@ set -e # Exit immediately if a command exits with a non-zero status. BASE='/home/leap/bitmask.bundle' + +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +VERSIONS_FILE="$SCRIPT_DIR/bitmask.json" +BINARY_COPIER="$SCRIPT_DIR/copy-binaries.sh" + mkdir -p $BASE # Note: we could use: @@ -121,7 +126,7 @@ set_pyside_environment() { copy_binaries() { cd $BASE - ../copy-binaries.sh + $BINARY_COPIER } create_bundler_paths() { @@ -174,17 +179,27 @@ run_bundler() { mkdir bundler.output # Use a shortcut for the bundler command - bundler="python bitmask_bundler.git/bundler/main.py --workon bundler.output --binaries binaries/ --paths-file bundler.paths" + bundler="python bitmask_bundler.git/bundler/main.py --workon bundler.output --binaries binaries/ --paths-file bundler.paths --versions-file $VERSIONS_FILE" - $bundler --do gitclone --versions-file $BASE/../bitmask.json - $bundler --do gitcheckout --versions-file $BASE/../bitmask.json + $bundler --do gitclone + $bundler --do gitcheckout - $bundler --do pythonsetup --versions-file $BASE/../bitmask.json - $bundler --skip gitclone gitcheckout pythonsetup --versions-file $BASE/../bitmask.json + $bundler --do pythonsetup + $bundler --skip gitclone gitcheckout pythonsetup } REUSE_BINARIES=$BASE/reuse-binaries.lock +if [[ ! -f $BINARY_COPIER ]]; then + echo "ERROR: missing $BINARY_COPIER file." + exit 1 +fi + +if [[ ! -f $VERSIONS_FILE ]]; then + echo "ERROR: missing $VERSIONS_FILE file." + exit 1 +fi + if [[ ! -f $REUSE_BINARIES ]]; then install_dependencies build_boost |