Fixed debian package + readme

1 files changed, 6 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index c57ef4d..ddf79b7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 VERSION=1.0
-DEBVER := $(shell cut -d'.' -f1 < /etc/debian_version)
+DEBVER := $(shell sed 's,[/\.].*,,' < /etc/debian_version)
 
 tests:
         @cd ./php-malware-finder && bash ./tests.sh
@@ -10,14 +10,16 @@ clean:
 
 extract:
         cp -r debian php-malware-finder
-        git checkout php-malware-finder/malwares.yara
+        git checkout php-malware-finder/common.yara
+        git checkout php-malware-finder/php.yara
+        git checkout php-malware-finder/asp.yara
 
 set_distribution:
-                sed -e "s/##version/`cut -d'.' -f1 < /etc/debian_version`/" -i php-malware-finder/debian/control php-malware-finder/debian/changelog
+        sed -e "s/##version/${DEBVER}/" -i php-malware-finder/debian/control php-malware-finder/debian/changelog
 
 check_distribution:
 ifeq ($(DEBVER),6)
-                sed -e '/too_many_chr/d'  -e '/b64_concat/d' -e 's/^import.*//g' -e 's/^include.*//g' -e 's/and\ not\ IsWhitelisted//g' -i php-malware-finder/malwares.yara
+                sed -e '/too_many_chr/d'  -e '/b64_concat/d' -e 's/^import.*//g' -e 's/^include.*//g' -e 's/and\ not\ IsWhitelisted//g' -i php-malware-finder/common.yara
 endif
 
 package: clean extract set_distribution check_distribution