Relintai/osxcross
1
0
Fork 0
mirror of https://github.com/Relintai/osxcross.git synced 2025-02-03 22:45:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix build_complete_file in get_sources

Browse Source 
Move setting build_complete_file to after fetching project_name using
get_project_name_from_url. Avoids empty ".FOO_build_complete" file name.
* Fix up a number of shellcheck issues in get_sources().

Signed-off-by: Ben Kochie <superq@gmail.com>
This commit is contained in:
Ben Kochie 2021-03-23 18:00:39 +01:00
parent da2c3d4ff6
commit 7838690391
No known key found for this signature in database
GPG Key ID: C646B23C9E3245F1
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/tools.sh
View File

@ -357,39 +357,40 @@ function build_msg()
function get_sources()
{
local url=$1
local branch=$2
local project_name=$3
local build_complete_file="$BUILD_DIR/.${project_name}_build_complete"
local url="$1"
local branch="$2"
local project_name="$3"
local build_complete_file
if [ -z "$project_name" ]; then
project_name=$(get_project_name_from_url $url)
if [[ -z "${project_name}" ]]; then
project_name=$(get_project_name_from_url "${url}")
fi
build_complete_file="${BUILD_DIR}/.${project_name}_build_complete"
CURRENT_BUILD_PROJECT_NAME=$project_name
CURRENT_BUILD_PROJECT_NAME="${project_name}"
build_msg $project_name $branch
build_msg "${project_name}" "${branch}"
if [[ "$SKIP_BUILD" == *$project_name* ]]; then
if [[ "${SKIP_BUILD}" == *${project_name}* ]]; then
f_res=0
return
fi
git_clone_repository $url $branch $project_name
git_clone_repository "${url}" "${branch}" "${project_name}"
if [ $f_res -eq 1 ]; then
rm -f $build_complete_file
if [[ $f_res -eq 1 ]]; then
rm -f "${build_complete_file}"
f_res=1
else
# nothing has changed upstream
if [ -f $build_complete_file ]; then
if [[ -f "${build_complete_file}" ]]; then
echo ""
echo "## Nothing to do ##"
echo ""
f_res=0
else
rm -f $build_complete_file
rm -f "${build_complete_file}"
f_res=1
fi
fi