Skip to content

Commit

Permalink
remove version.txt, edit things that used it to use show_version
Browse files Browse the repository at this point in the history
  • Loading branch information
@coalsont
coalsont committed Feb 16, 2021
1 parent d37267b commit 5bcf9f4
Show file tree
Hide file tree
Showing 17 changed files with 23 additions and 32 deletions.
2 changes: 1 addition & 1 deletion DeDriftAndResample/DeDriftAndResamplePipeline.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ show_tool_versions()
{
# Show HCP pipelines version
log_Msg "Showing HCP Pipelines version"
cat ${HCPPIPEDIR}/version.txt
"${HCPPIPEDIR}"/show_version --short

# Show wb_command version
log_Msg "Showing Connectome Workbench (wb_command) version"
Expand Down
2 changes: 1 addition & 1 deletion DeDriftAndResample/MSMRemoveGroupDrift.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ show_tool_versions()
{
# Show HCP pipelines version
log_Msg "Showing HCP Pipelines version"
cat ${HCPPIPEDIR}/version.txt
"${HCPPIPEDIR}"/show_version --short

# Show wb_command version
log_Msg "Showing wb_command version"
Expand Down
2 changes: 1 addition & 1 deletion GenerateSpinEchoBiasFieldPrereqs/GenerateSpinEchoBiasFieldPrereqs.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ show_tool_versions()
{
# Show HCP pipelines version
log_Msg "Showing HCP Pipelines version"
cat ${HCPPIPEDIR}/version.txt
"${HCPPIPEDIR}"/show_version --short
}

# ------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion ICAFIX/ApplyHandReClassifications.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ show_tool_versions()
{
# Show HCP Pipelines Version
log_Msg "Showing HCP Pipelines version"
cat ${HCPPIPEDIR}/version.txt
"${HCPPIPEDIR}"/show_version --short

# Show FSL version
log_Msg "Showing FSL version"
Expand Down
2 changes: 1 addition & 1 deletion ICAFIX/PostFix.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ get_options()
show_tool_versions() {
# Show HCP pipelines version
log_Msg "Showing HCP Pipelines version"
cat ${HCPPIPEDIR}/version.txt
"${HCPPIPEDIR}"/show_version --short

# Show wb_command version
log_Msg "Showing wb_command version"
Expand Down
2 changes: 1 addition & 1 deletion ICAFIX/ReApplyFixMultiRunPipeline.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ show_tool_versions()
{
# Show HCP pipelines version
log_Msg "Showing HCP Pipelines version"
cat ${HCPPIPEDIR}/version.txt
"${HCPPIPEDIR}"/show_version --short

# Show wb_command version
log_Msg "Showing Connectome Workbench (wb_command) version"
Expand Down
2 changes: 1 addition & 1 deletion ICAFIX/ReApplyFixPipeline.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ show_tool_versions()
{
# Show HCP pipelines version
log_Msg "Showing HCP Pipelines version"
cat ${HCPPIPEDIR}/version.txt
"${HCPPIPEDIR}"/show_version --short

# Show wb_command version
log_Msg "Showing Connectome Workbench (wb_command) version"
Expand Down
2 changes: 1 addition & 1 deletion ICAFIX/hcp_fix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ debug_enable_trap

# Show HCP pipelines version
log_Msg "Showing HCP Pipelines version"
cat ${HCPPIPEDIR}/version.txt
"${HCPPIPEDIR}"/show_version --short

# Show FSL version
log_Msg "Showing FSL version"
Expand Down
2 changes: 1 addition & 1 deletion ICAFIX/hcp_fix_multi_run
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ debug_enable_trap

# Show HCP pipelines version
log_Msg "Showing HCP Pipelines version"
cat ${HCPPIPEDIR}/version.txt
"${HCPPIPEDIR}"/show_version --short

# Show wb_command version
log_Msg "Showing Connectome Workbench (wb_command) version"
Expand Down
2 changes: 1 addition & 1 deletion MSMAll/MSMAllPipeline.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ show_tool_versions()
{
# Show HCP pipelines version
log_Msg "Showing HCP Pipelines version"
cat "${HCPPIPEDIR}"/version.txt
"${HCPPIPEDIR}"/show_version --short
}

# ------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion RestingStateStats/RestingStateStats.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ show_tool_versions()
{
# Show HCP pipelines version
log_Msg "Showing HCP Pipelines version"
cat ${HCPPIPEDIR}/version.txt
"${HCPPIPEDIR}"/show_version --short

# Show wb_command version
log_Msg "Showing Connectome Workbench (wb_command) version"
Expand Down
2 changes: 1 addition & 1 deletion Supplemental/MakeAverageDataset/MakeAverageDataset.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ show_tool_versions()
{
# Show HCP pipelines version
log_Msg "Showing HCP Pipelines version"
cat ${HCPPIPEDIR}/version.txt
"${HCPPIPEDIR}"/show_version --short

# Show wb_command version
log_Msg "Showing Connectome Workbench (wb_command) version"
Expand Down
2 changes: 1 addition & 1 deletion TaskfMRIAnalysis/scripts/TaskfMRILevel1.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ show_tool_versions()
{
# Show HCP pipelines version
log_Msg "TOOL_VERSIONS: Showing HCP Pipelines version"
cat ${HCPPIPEDIR}/version.txt
"${HCPPIPEDIR}"/show_version --short

# Show wb_command version
log_Msg "TOOL_VERSIONS: Showing Connectome Workbench (wb_command) version"
Expand Down
2 changes: 1 addition & 1 deletion TaskfMRIAnalysis/scripts/TaskfMRILevel2.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ show_tool_versions()
{
# Show HCP pipelines version
log_Msg "TOOL_VERSIONS: Showing HCP Pipelines version"
cat ${HCPPIPEDIR}/version.txt
"${HCPPIPEDIR}"/show_version --short

# Show wb_command version
log_Msg "TOOL_VERSIONS: Showing Connectome Workbench (wb_command) version"
Expand Down
16 changes: 6 additions & 10 deletions global/scripts/opts.shlib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,19 +103,15 @@ opts_CheckForImplicitHelpRequest() {
#
# If the script is invoked with a version information request
# option, report any available version identifying information
# for the HCP Pipeline Tools product (from the version.txt
# file in the root product directory) and exit.
# for the HCP Pipeline Tools product (from the show_version
# script in the root directory) and exit.
#
opts_ShowVersionIfRequested() {
if opts_CheckForVersionRequest $@; then
if [ -f ${HCPPIPEDIR}/product.txt ]; then
tool=`cat ${HCPPIPEDIR}/product.txt`
else
tool="Tool Unknown"
fi
tool="HCP Pipeline Scripts"

if [ -f ${HCPPIPEDIR}/version.txt ]; then
version=`cat ${HCPPIPEDIR}/version.txt`
if [ -f "${HCPPIPEDIR}"/show_version ]; then
version=`"${HCPPIPEDIR}"/show_version --short`
else
version="Version unknown"
fi
Expand All @@ -142,4 +138,4 @@ opts_CheckForFlag() {
fi
done
return 1
}
}
10 changes: 3 additions & 7 deletions global/scripts/version.shlib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,10 @@ version_show() {
local tool
local version

if [ -f ${HCPPIPEDIR}/product.txt ]; then
tool=`cat ${HCPPIPEDIR}/product.txt`
else
tool="Tool Unknown"
fi
tool="HCP Pipeline Scripts"

if [ -f ${HCPPIPEDIR}/version.txt ]; then
version=`cat ${HCPPIPEDIR}/version.txt`
if [ -f "${HCPPIPEDIR}"/show_version ]; then
version=`"${HCPPIPEDIR}"/show_version --short`
else
version="Version unknown"
fi
Expand Down
1 change: 0 additions & 1 deletion version.txt
View file

This file was deleted.

0 comments on commit 5bcf9f4

Please sign in to comment.