Index: main.cpp =================================================================== diff -u -r1bf8c894c5cc5ea6d62af0662fcf5a18e1a06459 -r4e38f708244b0118abcf7e616af24aa8be3776b2 --- main.cpp (.../main.cpp) (revision 1bf8c894c5cc5ea6d62af0662fcf5a18e1a06459) +++ main.cpp (.../main.cpp) (revision 4e38f708244b0118abcf7e616af24aa8be3776b2) @@ -365,23 +365,28 @@ isOnServer = false; } + bool isRelease = ver_branch.startsWith("release/"); bool isOnMaster = ver_branch == "master"; - bool isNotStory = isOnMaster - || ver_branch == "staging" - || ver_branch == "develop"; + bool isNotStory = isRelease || + isOnMaster || + ver_branch == "staging" || + ver_branch == "develop" ; if (isNotStory) { if (isOnServer) { if (isOnMaster ) { ver_branch = ""; // if only is built on server master branch do not show branch } + if ( isRelease ) { + ver_branch = ver_branch.remove(0,QString("release/").length()).toUpper(); + } ver_major += '.'; ver_minor += '.'; ver_micro += '.'; } } if ( ! ver_branch.isEmpty()) ver_branch += '.'; - ver_comp = "." + ver_comp; + ver_comp = "-" + ver_comp; QString version = ""; version += ver_branch ; version += ver_major ; @@ -395,16 +400,16 @@ /*! * \brief lockdown - * \details runs the lockdown shellscript as a detached process - * and ment to be executed just before the application quits + * \details runs the lockdown shell script as a detached process + * and meant to be executed just before the application quits * and only when application running in manufacturing or update mode. * Must not stop application shutdown in any way. * If any error happens it only logs. */ void lockdown() { // there are two setup scenarios: // only during setup mode which is -E (manufacturing setup) or -U -E (update setup) application is running under the root user permissions - // and all the files are copied to the /home/root/ te later be copied to secured locations + // and all the files are copied to the /home/root/ to later be copied to secured locations // and that will be done by lockdown.sh script running within application after the user is done with the setup and QUIT s the application. if ( gEnableManufacturing || gEnableUpdating ) { QString scriptName = Storage::Device_Lockdown;