diff --git a/DeDriftAndResample/DeDriftAndResamplePipeline.sh b/DeDriftAndResample/DeDriftAndResamplePipeline.sh index 62d8271b7..2387c1146 100755 --- a/DeDriftAndResample/DeDriftAndResamplePipeline.sh +++ b/DeDriftAndResample/DeDriftAndResamplePipeline.sh @@ -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" diff --git a/DeDriftAndResample/MSMRemoveGroupDrift.sh b/DeDriftAndResample/MSMRemoveGroupDrift.sh index 4def2c273..1c84ae8cf 100755 --- a/DeDriftAndResample/MSMRemoveGroupDrift.sh +++ b/DeDriftAndResample/MSMRemoveGroupDrift.sh @@ -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" diff --git a/GenerateSpinEchoBiasFieldPrereqs/GenerateSpinEchoBiasFieldPrereqs.sh b/GenerateSpinEchoBiasFieldPrereqs/GenerateSpinEchoBiasFieldPrereqs.sh index 9978b6762..c33d155e5 100755 --- a/GenerateSpinEchoBiasFieldPrereqs/GenerateSpinEchoBiasFieldPrereqs.sh +++ b/GenerateSpinEchoBiasFieldPrereqs/GenerateSpinEchoBiasFieldPrereqs.sh @@ -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 } # ------------------------------------------------------------------------------ diff --git a/ICAFIX/ApplyHandReClassifications.sh b/ICAFIX/ApplyHandReClassifications.sh index 8bad2e8be..6d21df4df 100755 --- a/ICAFIX/ApplyHandReClassifications.sh +++ b/ICAFIX/ApplyHandReClassifications.sh @@ -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" diff --git a/ICAFIX/PostFix.sh b/ICAFIX/PostFix.sh index a5f1a7b0d..1f58885fa 100755 --- a/ICAFIX/PostFix.sh +++ b/ICAFIX/PostFix.sh @@ -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" diff --git a/ICAFIX/ReApplyFixMultiRunPipeline.sh b/ICAFIX/ReApplyFixMultiRunPipeline.sh index 9d3206515..b3af636d2 100755 --- a/ICAFIX/ReApplyFixMultiRunPipeline.sh +++ b/ICAFIX/ReApplyFixMultiRunPipeline.sh @@ -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" diff --git a/ICAFIX/ReApplyFixPipeline.sh b/ICAFIX/ReApplyFixPipeline.sh index d5ead561b..cf90064ca 100755 --- a/ICAFIX/ReApplyFixPipeline.sh +++ b/ICAFIX/ReApplyFixPipeline.sh @@ -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" diff --git a/ICAFIX/hcp_fix b/ICAFIX/hcp_fix index dcf47b0b0..11ca5dcfd 100755 --- a/ICAFIX/hcp_fix +++ b/ICAFIX/hcp_fix @@ -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" diff --git a/ICAFIX/hcp_fix_multi_run b/ICAFIX/hcp_fix_multi_run index a7d068b70..64312f156 100755 --- a/ICAFIX/hcp_fix_multi_run +++ b/ICAFIX/hcp_fix_multi_run @@ -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" diff --git a/MSMAll/MSMAllPipeline.sh b/MSMAll/MSMAllPipeline.sh index 8932a079c..7361d9d7c 100755 --- a/MSMAll/MSMAllPipeline.sh +++ b/MSMAll/MSMAllPipeline.sh @@ -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 } # ------------------------------------------------------------------------------ diff --git a/RestingStateStats/RestingStateStats.sh b/RestingStateStats/RestingStateStats.sh index e54c6064c..787805421 100755 --- a/RestingStateStats/RestingStateStats.sh +++ b/RestingStateStats/RestingStateStats.sh @@ -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" diff --git a/Supplemental/MakeAverageDataset/MakeAverageDataset.sh b/Supplemental/MakeAverageDataset/MakeAverageDataset.sh index 6e4baac5d..547876f75 100755 --- a/Supplemental/MakeAverageDataset/MakeAverageDataset.sh +++ b/Supplemental/MakeAverageDataset/MakeAverageDataset.sh @@ -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" diff --git a/TaskfMRIAnalysis/scripts/TaskfMRILevel1.sh b/TaskfMRIAnalysis/scripts/TaskfMRILevel1.sh index 83068bd4b..6937d156c 100755 --- a/TaskfMRIAnalysis/scripts/TaskfMRILevel1.sh +++ b/TaskfMRIAnalysis/scripts/TaskfMRILevel1.sh @@ -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" diff --git a/TaskfMRIAnalysis/scripts/TaskfMRILevel2.sh b/TaskfMRIAnalysis/scripts/TaskfMRILevel2.sh index d2174c955..2dd341406 100755 --- a/TaskfMRIAnalysis/scripts/TaskfMRILevel2.sh +++ b/TaskfMRIAnalysis/scripts/TaskfMRILevel2.sh @@ -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" diff --git a/global/scripts/opts.shlib b/global/scripts/opts.shlib index 9f6fca7e8..fa9dcdf9a 100644 --- a/global/scripts/opts.shlib +++ b/global/scripts/opts.shlib @@ -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 @@ -142,4 +138,4 @@ opts_CheckForFlag() { fi done return 1 -} \ No newline at end of file +} diff --git a/global/scripts/version.shlib b/global/scripts/version.shlib index 3b31240e9..c8fc74eba 100644 --- a/global/scripts/version.shlib +++ b/global/scripts/version.shlib @@ -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 diff --git a/version.txt b/version.txt deleted file mode 100644 index 515dbff50..000000000 --- a/version.txt +++ /dev/null @@ -1 +0,0 @@ -Post-v4.3.0