Merge pull request #390 from tiffanycmeyer13/unidata_18.2.1

Minor NDM updates

.gitignore

@@ -14,7 +14,6 @@ build/logs/
 *.o
 *.orig
 keepLocal
-.project
 .pydevproject
 build/clean.sh
 cave/diff.txt

awips_install.sh

@@ -222,6 +222,14 @@ function server_prep {
   check_epel
 }
 
+function disable_ndm_update {
+  crontab -u awips -l >cron_backup
+  crontab -u awips -r
+  sed -i -e 's/30 3 \* \* \* \/bin\/perl \/awips2\/dev\/updateNDM.pl/#30 3 \* \* \* \/bin\/perl \/awips2\/dev\/updateNDM.pl/' cron_backup
+  crontab -u awips cron_backup
+  rm cron_backup
+}
+
 function cave_prep {
   check_cave
   check_users
@@ -249,11 +257,13 @@ case $key in
     --database)
         server_prep
         yum groupinstall awips2-database -y 2>&1 | tee -a /tmp/awips-install.log
+        disable_ndm_update
         echo "EDEX database has finished installing, the install log can be found in /tmp/awips-install.log"
         ;;
     --ingest)
         server_prep
         yum groupinstall awips2-ingest -y 2>&1 | tee -a /tmp/awips-install.log
+        disable_ndm_update
         echo "EDEX ingest has finished installing, the install log can be found in /tmp/awips-install.log"
         ;;
     -h|--help)

edexOsgi/com.raytheon.uf.edex.ndm/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.raytheon.uf.edex.ndm</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

rpms/awips2.edex/Installer.edex/programs/updateNDM.pl

@@ -5,10 +5,9 @@
 $ndmGitPath = "rpms/awips2.edex/Installer.edex/ndm/";
 
 #get the current branch/version of awips2
-$version = `grep AWIPSII_VERSION /awips2/repo/awips2/build/buildEnvironment.sh`;
+$version = `rpm -qa | grep awips2-[12]`;
 chomp $version;
-@split = split(/"/,$version);
-
+@split=split(/-/,$version);
 $branch = "unidata_$split[1]";
 
 #Check if ndm location has been created