diff --git a/bin/ubuntu24.04/getdcmtags b/bin/ubuntu24.04/getdcmtags index 73418e0..9989c39 100755 Binary files a/bin/ubuntu24.04/getdcmtags and b/bin/ubuntu24.04/getdcmtags differ diff --git a/getdcmtags/check_version.sh b/getdcmtags/check_version.sh index 1ca20ce..5ed343f 100755 --- a/getdcmtags/check_version.sh +++ b/getdcmtags/check_version.sh @@ -1,15 +1,30 @@ #!/usr/bin/env bash -binary_version=$(../bin/ubuntu22.04/getdcmtags --version | grep -oP 'Version \K.*' ) -source_version=$(grep -oP '#define VERSION "\K.*(?=")' ../getdcmtags/main.cpp) - -echo "Binary version: $binary_version" +source_version=$(grep -oP '#define VERSION "getdcmtags Version \K.*(?=")' ../getdcmtags/main.cpp) echo "Source version: $source_version" + +binary_version_2004=$(strings ../bin/ubuntu20.04/getdcmtags | grep -oP "getdcmtags Version \K.*" ) +echo "Binary version for Ubuntu 20.04: $binary_version_2004" + +binary_version_2204=$(strings ../bin/ubuntu22.04/getdcmtags | grep -oP "getdcmtags Version \K.*" ) +echo "Binary version for Ubuntu 22.04: $binary_version_2204" + +binary_version_2404=$(strings ../bin/ubuntu24.04/getdcmtags | grep -oP "getdcmtags Version \K.*" ) +echo "Binary version for Ubuntu 24.04: $binary_version_2404" + echo "" -if [ "$binary_version" == "$source_version" ]; then - echo "Versions match." - exit 0 -else +if [ "$binary_version_2004" != "$source_version" ]; then echo "Versions do not match!" exit 1 -fi \ No newline at end of file +fi +if [ "$binary_version_2204" != "$source_version" ]; then + echo "Versions do not match!" + exit 1 +fi +if [ "$binary_version_2404" != "$source_version" ]; then + echo "Versions do not match!" + exit 1 +fi + +echo "All versions match." +exit 0 diff --git a/getdcmtags/main.cpp b/getdcmtags/main.cpp index bf4d5dc..e3c9145 100755 --- a/getdcmtags/main.cpp +++ b/getdcmtags/main.cpp @@ -23,8 +23,7 @@ #include "tags_list.h" -#define VERSION "0.72" - +#define VERSION "getdcmtags Version 0.73" static OFString tagSpecificCharacterSet = ""; static OFString tagSeriesInstanceUID = ""; @@ -354,7 +353,7 @@ int main(int argc, char *argv[]) if (argc < 5) { std::cout << std::endl; - std::cout << "getdcmtags Version " << VERSION << std::endl; + std::cout << VERSION << std::endl; std::cout << "------------------------" << std::endl << std::endl; std::cout << "Usage: [dcm file to analyze] [sender address] [sender AET] [receiver AET] [ip:port of bookkeeper] [api key for bookkeeper]" << std::endl