8000 Fixes install_or_tools.sh by roytman · Pull Request #1911 · fybrik/fybrik · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fixes install_or_tools.sh #1911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jan 22, 2023
Merged

Fixes install_or_tools.sh #1911

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4f29a8e
Fixes install_or_tools.sh
roytman Jan 19, 2023
1347905
Merge branch 'master' into or
shlomitk1 Jan 19, 2023
c9b00d7
Merge branch 'master' into or
roytman Jan 19, 2023
7d4082f
Update hack/tools/install_or_tools.sh
roytman Jan 19, 2023
e18be0f
Update hack/tools/install_or_tools.sh
roytman Jan 19, 2023
c18f646
Merge branch 'master' into or
roytman Jan 19, 2023
58b45e5
Merge branch 'master' into or
shlomitk1 Jan 19, 2023
0ea4084
move fzn-or-tools build and version files from lib
roytman Jan 19, 2023
f358dcb
test
roytman Jan 19, 2023
5c84a25
test2
roytman Jan 19, 2023
e0551d5
test3
roytman Jan 20, 2023
b6b1feb
add print OS and Arch
roytman Jan 22, 2023
8391535
return the binary existence check
roytman Jan 22, 2023
12df6b1
add prints
roytman Jan 22, 2023
87799bf
prevent errors from cat
roytman Jan 22, 2023
309b6b5
add check OS and arch test
roytman Jan 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions hack/tools/install_or_tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# Copyright 2020 IBM Corp.
# SPDX-License-Identifier: Apache-2.0


cd "${0%/*}"
source ./common.sh

VERSION_FILE=lib/fzn-or-tools-version

case ${os} in
linux)
Expand All @@ -22,10 +22,12 @@ case ${os} in
;;
esac

header_text "Checking for bin/fzn-or-tools ${OR_TOOLS_VERSION}.${OR_TOOLS_BUILD}"
[[ -f bin/fzn-or-tools ]] && [[ -f lib/libfz.so ]] && exit 0
DEPLOY="${OR_TOOLS_VERSION}.${OR_TOOLS_BUILD}_for_${arch}_${target_os}"

header_text "Checking for bin/fzn-or-tools ${DEPLOY}"
[[ -f bin/fzn-or-tools ]] && [[ -f "${VERSION_FILE}" ]] && [[ `cat "${VERSION_FILE}"` == "${DEPLOY}" ]] && exit 0
header_text "Installing bin/fzn-or-tools ${DEPLOY}"

header_text "Installing bin/fzn-or-tools ${OR_TOOLS_VERSION}.${OR_TOOLS_BUILD}"
mkdir -p ./bin
mkdir -p ./lib

Expand All @@ -37,3 +39,4 @@ tar -zxvf ./${download_file} -C $tmp
mv $tmp/*/bin/fzn-ortools ./bin/fzn-or-tools
mv $tmp/*/lib*/lib*.${dyn_lib_ext}* ./lib
chmod +x ./bin/fzn-or-tools
echo ${DEPLOY} > ${VERSION_FILE}
0