Merge pull request #802 from apilynx/master

Update gvm-portnames-update

CHANGELOG.md

@@ -19,7 +19,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Faster counting in GET_REPORTS when ignoring pagination [#795](https://github.com/greenbone/gvmd/pull/795)
 - Improve performance of GET_REPORTS [#797](https://github.com/greenbone/gvmd/pull/797)
 - Consider results_trash when deleting users [#800](https://github.com/greenbone/gvmd/pull/800)
-- Escaping correctly the percent sign in sql statements  [#818](https://github.com/greenbone/gvmd/pull/818)
+- Update to gvm-portnames-update to use new nomenclature [#802](https://github.com/greenbone/gvmd/pull/802)
+- Escaping correctly the percent sign in sql statements [#818](https://github.com/greenbone/gvmd/pull/818)
 
 ### Removed
 - Remove suport for "All SecInfo": removal of "allinfo" for type in get_info [#790](https://github.com/greenbone/gvmd/pull/790)

tools/gvm-portnames-update.in

@@ -49,12 +49,12 @@ fi
 
 # Configure DB_DIR where our DB is located.
 if [ -z "$DB_DIR" ]; then
-  OPENVASSD=`which openvassd`
-  if [ -z "$OPENVASSD" ] ; then
-    echo "[e] Error: openvassd is not in the path, could not determine the Manager directory."
+  OPENVAS=`which openvas`
+  if [ -z "$OPENVAS" ] ; then
+    echo "[e] Error: openvas is not in the path, could not determine the Manager directory."
     exit 1
   else
-    OV_DIR=`openvassd -s | awk -F" = " '/^plugins_folder/ { print $2 }' | sed -s 's/\(^.*\)\/plugins/\1/'`
+    OV_DIR=`openvas -s | awk -F" = " '/^plugins_folder/ { print $2 }' | sed -s 's/\(^.*\)\/plugins/\1/'`
   fi
   DB_DIR="$OV_DIR/gvmd"
 fi