Skip to content
Snippets Groups Projects
Commit fa1f05cc authored by Shusaku Arakuta's avatar Shusaku Arakuta
Browse files

Merge branch 'devel-arakuta-bug' into 'master'

Devel arakuta bug

See merge request !14
parents 175e0c78 7ec79973
Branches
Tags 1.0.2
1 merge request!14Devel arakuta bug
Pipeline #3646936 passed
...@@ -94,8 +94,10 @@ if echo "${scanName}" | grep "tune_globalpreamp" >>/dev/null; then ...@@ -94,8 +94,10 @@ if echo "${scanName}" | grep "tune_globalpreamp" >>/dev/null; then
exit 1 exit 1
else else
targetAmpOrCharge=$(jq -j '.common_config.target_preamp' $SCANCFG) targetAmpOrCharge=$(jq -j '.common_config.target_preamp' $SCANCFG)
targetToT=$(echo $scan | jq -r '.[1]') targetToT=$(echo $scan | jq -r '.[1]')
fi fi
elif echo "${scanName}" | grep "totscan" >>/dev/null; then
targetAmpOrCharge=$(jq -j '.common_config.target_preamp' $SCANCFG)
else else
targetToT="" targetToT=""
if [[ $(echo $scan | jq '. | length') == 2 ]]; then if [[ $(echo $scan | jq '. | length') == 2 ]]; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment