dnrops
/
Cuckoo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some `run` script bugs.

This commit is contained in:
Matyáš Kříž 2019-05-16 13:29:44 +02:00
parent ec10e6bf00
commit 7a41a928fc
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Generator/.swift-version
View File

@ -1 +1 @@
4.2 4.2.1

17
run
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
SCRIPT_PATH="$(dirname "$0")" SCRIPT_PATH="$(dirname `realpath $0`)"
FILE_NAME="cuckoo_generator" FILE_NAME="cuckoo_generator"
FILE_PATH="$SCRIPT_PATH/$FILE_NAME" FILE_PATH="$SCRIPT_PATH/$FILE_NAME"
GREP_OPTIONS="" GREP_OPTIONS=""
@ -11,6 +11,7 @@ function perform_curl {
fi fi
DOWNLOAD_URL=$(curl "${CURL_OPTIONS[@]}" "$1" | grep -oe '"browser_download_url":\s*"[^" ]*"' | grep -oe 'http[^" ]*' | grep "$FILE_NAME" | head -1) DOWNLOAD_URL=$(curl "${CURL_OPTIONS[@]}" "$1" | grep -oe '"browser_download_url":\s*"[^" ]*"' | grep -oe 'http[^" ]*' | grep "$FILE_NAME" | head -1)
echo "Downloading Cuckoo Generator from URL: $DOWNLOAD_URL"
curl "${CURL_OPTIONS[@]}" -Lo "$FILE_NAME" "$DOWNLOAD_URL" curl "${CURL_OPTIONS[@]}" -Lo "$FILE_NAME" "$DOWNLOAD_URL"
} }
@ -39,7 +40,7 @@ function build_generator {
fi fi
mv "$SCRIPT_PATH/Generator/.build/release/$FILE_NAME" "$FILE_PATH" mv "$SCRIPT_PATH/Generator/.build/release/$FILE_NAME" "$FILE_PATH"
else else
echo "Couldn't build. Generator source code not found. (expected in the `Generator` directory)" echo "Couldn't build. Generator source code not found. (expected in the 'Generator' directory)"
download_generator "$2" download_generator "$2"
fi fi
fi fi
@ -52,21 +53,23 @@ while [[ $# -gt 0 ]]
do do
case $1 in case $1 in
-d|--download) -d|--download)
if [[ "$2" = --* ]]; then if [[ "$2" = "latest" ]]; then
DOWNLOAD="latest" DOWNLOAD="latest"
shift
else else
DOWNLOAD=$(echo "$2" | grep -e "\d\d*\.\d\d*\.\d\d*") DOWNLOAD=$(echo "$2" | grep -e "\d\d*\.\d\d*\.\d\d*")
if [[ -z $DOWNLOAD ]]; then if [[ ! -z $DOWNLOAD ]]; then
echo "Invalid Cuckoo Generator version: $2; Please use the semantic versioning. (e.g. 0.12.0)"
exit 1
fi
shift shift
else
DOWNLOAD="latest"
fi
fi fi
shift shift
;; ;;
-c|--clean) -c|--clean)
CLEAN=1 CLEAN=1
echo "Performing clean build."
shift shift
;; ;;