take version from zmes

make_tag.sh

@@ -1,13 +1,22 @@
 #!/bin/bash
 if [ -z "$1" ]; then
-    echo "Getting version name from zm_detect.py"
-    TAGVER=`python ./hook/zm_detect.py --bareversion`
+    #echo "Getting version name from zm_detect.py"
+    #TAGVER=`python ./hook/zm_detect.py --bareversion`
+    echo 'Getting version from zmeventnotification.pl'
+    if [[ `cat ./zmeventnotification.pl` =~ my\ \$app_version\ =\ \'([0-9]*\.[0-9]*\.[0-9]*)\'\; ]];
+    then
+	    TAGVER=${BASH_REMATCH[1]}
+    else
+	    echo "Bad version parsing"
+	    exit
+    fi
 else
 	TAGVER=$1
 fi
 VER="${TAGVER/v/}"
 echo "Creating tag:v$VER"
-
+echo "(FYI: zm_detect version is `python ./hook/zm_detect.py --bareversion`)"
+echo
 read -p "Please generate CHANGELOG and commit it BEFORE you tag. Press a key when ready..."
 read -p "Press any key to create the tag or Ctrl-C to break..." -n1 
 git tag -fa v$VER -m"v$VER"

zmeventnotification.pl

@@ -43,8 +43,6 @@
 use Symbol qw(qualify_to_ref);
 use IO::Select;
 
-#use Memory::Usage;
-
 ####################################
 my $app_version = '6.1.9';
 ####################################
@@ -300,6 +298,8 @@
 
 # This part makes sure we have the right core deps. See later for optional deps
 
+
+
 if ( !try_use('Net::WebSocket::Server') ) {
   Fatal('Net::WebSocket::Server missing');
 }
@@ -831,6 +831,7 @@ sub print_config {
 #
 # ==========================================================================
 
+
 use ZoneMinder;
 use POSIX;
 use DBI;
@@ -918,6 +919,7 @@ sub REAPER {
 # Main entry point
 #
 
+
 printInfo("|------- Starting ES version: $app_version ---------|");
 printDebug( "Started with: perl:" . $^X . " and command:" . $0, 1 );