move utility scripts to a ./utils/ subfolder

1 files changed, 7 insertions, 6 deletions

diff --git a/php-malware-finder/generate_whitelist.py b/php-malware-finder/utils/generate_whitelist.py
index af6be27..231eb1f 100755
--- a/php-malware-finder/generate_whitelist.py
+++ b/php-malware-finder/utils/generate_whitelist.py
@@ -19,7 +19,7 @@ if not os.path.isdir(sys.argv[2]):
     print('%s is not a folder !' % sys.argv[2])
     sys.exit(1)
 
-rules = yara.compile('./php.yar', includes=True, error_on_warning=True)
+rules = yara.compile('../php.yar', includes=True, error_on_warning=True)
 
 output_list = list()
 
@@ -34,8 +34,9 @@ for curdir, dirnames, filenames in os.walk(sys.argv[2]):
                 output_list.append('hash.sha1(0, filesize) == "%s" or // %s' % (digest, fname))
 
 
-output_rule = 'import "hash"\n\nrule %s\n{\n\tcondition:\n\t\t/* %s */\n\t\t' % (sys.argv[1].split(' ')[0], sys.argv[1])
-output_list.append(output_list.pop().replace(' or ', '    '))
-output_rule += '\n\t\t'.join(output_list)
-output_rule += '\n}'
-print(output_rule)
+if output_list:
+    output_rule = 'import "hash"\n\nrule %s\n{\n\tcondition:\n\t\t/* %s */\n\t\t' % (sys.argv[1].split(' ')[0], sys.argv[1])
+    output_list.append(output_list.pop().replace(' or ', '    '))
+    output_rule += '\n\t\t'.join(output_list)
+    output_rule += '\n}'
+    print(output_rule)