MMA-10748 Update to meet new v1.694 Plugin Manager requirements

.gitattributes

@@ -1,4 +1,4 @@
 .github export-ignore
 .gitignore export-ignore
 .gitattributes export-ignore
-plugin.conf.new export-subst
+plugin.conf export-subst

plugin.conf.new → plugin.conf

@@ -1,8 +1,8 @@
 active=yes
 author=SpamExperts
-id=<PLUGINNAME>
+id=prospamfilter
 installed=yes
-name="Professional Spam Filter"
+name=Professional Spam Filter
 update_url=http://download.cdn.seinternal.com/releases/addons/directadmin/latest.tar.gz
 version=4.0.$Format:%at$
 version_url=http://download.cdn.seinternal.com/releases/addons/directadmin/latest_version.html

scripts/install.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-pluginpath=$DOCUMENT_ROOT../;
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd );
-PDIR="$(dirname "$DIR")";
-PLUGIN=${PDIR##*/};
+pluginpath=$DOCUMENT_ROOT../
+DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+PDIR="$(dirname "$DIR")"
+PLUGIN=${PDIR##*/}
 
 HOOKFILES="$PDIR/hooks/*"
 HOOKSCRIPTS="$PDIR/scripts/hooks/*"
@@ -13,27 +13,26 @@ USERFILES="$PDIR/user/*"
 CONFFILE="$PDIR/plugin.conf"
 LIBFILES="$PDIR/lib/*"
 
-mv "$pluginpath/configuration.conf.new" "$pluginpath/configuration.conf";
-mv "$pluginpath/directadminapi.conf.new" "$pluginpath/directadminapi.conf";
-mv "$pluginpath/plugin.conf.new" "$pluginpath/plugin.conf";
+mv "$pluginpath/configuration.conf.new" "$pluginpath/configuration.conf"
+mv "$pluginpath/directadminapi.conf.new" "$pluginpath/directadminapi.conf"
 
 ALLFILES="$HOOKFILES $HOOKSCRIPTS $ADMINFILES $RESELLERFILES $USERFILES $LIBFILES $CONFFILE"
 
 for file in $ALLFILES; do
-    sed -i -e "s/<PLUGINNAME>/$PLUGIN/g" $file
-done;
+  sed -i -e "s/<PLUGINNAME>/$PLUGIN/g" $file
+done
 
 echo "Adding hooks to DirectAdmin<br/>"
 
 for hook in domain_create_post domain_destroy_post domain_pointer_create_post domain_pointer_destroy_post; do
-  if [ -e "$pluginpath../../scripts/custom/$hook.sh" ] ; then
-    echo "WARNING! - hook file '$hook.sh' already exist<br/>";
+  if [ -e "$pluginpath../../scripts/custom/$hook.sh" ]; then
+    echo "WARNING! - hook file '$hook.sh' already exist<br/>"
   else
     cp "$pluginpath/scripts/hooks/$hook.sh" "$pluginpath../../scripts/custom/"
     chmod 770 "$pluginpath../../scripts/custom/$hook.sh"
     chown diradmin:diradmin "$pluginpath../../scripts/custom/$hook.sh"
   fi
-done;
+done
 
 echo "Creating configuration files<br/>"
 
@@ -42,21 +41,21 @@ chown -R diradmin:diradmin $pluginpath/*
 
 # creating configuration files
 for conf in configuration.conf directadminapi.conf plugin.conf; do
-  if [ ! -e "$pluginpath$conf" ] ; then
+  if [ ! -e "$pluginpath$conf" ]; then
     touch "$pluginpath$conf"
   fi
   chmod 660 "$pluginpath$conf"
   chown diradmin:diradmin "$pluginpath$conf"
-done;
+done
 
 chown root:root "$pluginpath/scripts/getconfig" 2>&1
 chmod 4755 "$pluginpath/scripts/getconfig" 2>&1
 
 if [ ! -e "$pluginpath/logs" ]; then
-    mkdir "$pluginpath/logs"
+  mkdir "$pluginpath/logs"
 fi
 chmod 777 "$pluginpath/logs"
 chown diradmin:diradmin "$pluginpath/logs"
 
-echo "Plugin Installed!<br/>";
-exit 0;
+echo "Plugin Installed!<br/>"
+exit 0

scripts/uninstall.sh

@@ -12,9 +12,9 @@ for hook in domain_create_post domain_destroy_post domain_pointer_create_post do
   cmp --silent $installedhook "${DOCUMENT_ROOT}hooks/$hook.sh"
   if [ $? -ne 0 ]; then
     echo "WARNING! - hook file '$hook.sh' differs from the plugin's one. Skipping it.<br/>"
-    else
-        rm "$pluginpath../../scripts/custom/$hook.sh"
-    fi
+  else
+    rm "$pluginpath../../scripts/custom/$hook.sh"
+  fi
 done
 
 echo "Plugin Un-Installed!"

scripts/update.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 pluginpath=$DOCUMENT_ROOT../
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 PDIR="$(dirname "$DIR")"
 PLUGIN=${PDIR##*/}
 
@@ -16,15 +16,15 @@ LIBFILES="$PDIR/lib/*"
 ALLFILES="$HOOKFILES $HOOKSCRIPTS $ADMINFILES $RESELLERFILES $USERFILES $LIBFILES $CONFFILE"
 
 for file in $ALLFILES; do
-    sed -i -e "s/<PLUGINNAME>/$PLUGIN/g" $file
+  sed -i -e "s/<PLUGINNAME>/$PLUGIN/g" $file
 done
 
 chmod -R 755 $pluginpath/*
 chown -R diradmin:diradmin $pluginpath/*
 
 # creating configuration files
 for conf in configuration.conf directadminapi.conf plugin.conf; do
-  if [ ! -e "$pluginpath$conf" ] ; then
+  if [ ! -e "$pluginpath$conf" ]; then
     touch "$pluginpath$conf"
   fi
   chmod 660 "$pluginpath$conf"
@@ -35,23 +35,13 @@ chown root:root "$pluginpath/scripts/getconfig" 2>&1
 chmod 4755 "$pluginpath/scripts/getconfig" 2>&1
 
 if [ ! -e "$pluginpath/logs" ]; then
-    mkdir "$pluginpath/logs"
+  mkdir "$pluginpath/logs"
 fi
 chmod 777 "$pluginpath/logs"
 chown diradmin:diradmin "$pluginpath/logs"
 
-rm "$pluginpath/configuration.conf.new";
-rm "$pluginpath/directadminapi.conf.new";
-
-# update plugin.conf with new version number and urls
-newupdateurl=$(grep "^update_url=.*$" "$pluginpath/plugin.conf.new")
-sed -i -e "s|^update_url=.*$|$newupdateurl|" "$pluginpath/plugin.conf"
-newversion=$(grep "^version=.*$" "$pluginpath/plugin.conf.new")
-sed -i -e "s|^version=.*$|$newversion|" "$pluginpath/plugin.conf"
-newversionurl=$(grep "^version_url=.*$" "$pluginpath/plugin.conf.new")
-sed -i -e "s|^version_url=.*$|$newversionurl|" "$pluginpath/plugin.conf"
-
-rm "$pluginpath/plugin.conf.new"
+rm "$pluginpath/configuration.conf.new"
+rm "$pluginpath/directadminapi.conf.new"
 
 echo "Plugin has been updated!"