Skip to content

Move updating jq earlier in the install script #33

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
cluckj merged 1 commit into from
Mar 28, 2019
Merged

Move updating jq earlier in the install script #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Move updating jq earlier in the install script 
Some jq calls between lines 683 and 1132 need `sub`, which is only supported in newer versions of jq...
  • Loading branch information
@cluckj
cluckj authored Mar 21, 2019
commit 1ac944836e8699f243efdeb4ab73767b7db75381
13 changes: 8 additions & 5 deletions bin/oref0-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,14 @@ if prompt_yn "" N; then
sudo bash -c "curl -sL https://deb.nodesource.com/setup_8.x | bash -" || die "Couldn't setup node 8"
sudo apt-get install -y nodejs || die "Couldn't install nodejs"
fi

# Make sure jq version >1.5 is installed
if is_edison; then
sudo apt-get -y -t jessie-backports install jq
else
sudo apt-get -y install jq
fi

echo Checking oref0 installation
cd $HOME/src/oref0
if git branch | grep "* master"; then
Expand Down Expand Up @@ -1129,11 +1137,6 @@ if prompt_yn "" N; then
sudo cp $HOME/src/oref0/lib/oref0-setup/pancreoptions.json $directory/pancreoptions.json
fi

if is_edison; then
sudo apt-get -y -t jessie-backports install jq
else
sudo apt-get -y install jq
fi
# configure autotune if enabled
if [[ $ENABLE =~ autotune ]]; then
cd $directory || die "Can't cd $directory"
Expand Down