minor fix

xtr4nge · Jun 9, 2015 · 4bfcde1 · 4bfcde1
1 parent 703807a
commit 4bfcde1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/FruityWifi/www/page_config_adv.php b/FruityWifi/www/page_config_adv.php
@@ -232,10 +232,10 @@
 	    &nbsp;[AP]
 	    <select class="input" onchange="this.form.submit()" name="ap_mode">
 		<option value="1" <? if ($ap_mode == 1) echo "selected"?> >Hostapd</option>
-		<? if (file_exists("/usr/share/FruityWifi/www/modules/mana/includes/hostapd")) { ?>
+		<? if (file_exists("/usr/share/fruitywifi/www/modules/mana/includes/hostapd")) { ?>
 		<option value="3" <? if ($ap_mode == 3) echo "selected"?> >Hostapd-Mana</option>
 		<? } ?>
-		<? if (file_exists("/usr/share/FruityWifi/www/modules/karma/includes/hostapd")) { ?>
+		<? if (file_exists("/usr/share/fruitywifi/www/modules/karma/includes/hostapd")) { ?>
 		<option value="4" <? if ($ap_mode == 4) echo "selected"?> >Hostapd-Karma</option>
 		<? } ?>
 		<option value="2" <? if ($ap_mode == 2) echo "selected"?> >Airmon-ng</option>

diff --git a/install-modules.py b/install-modules.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-#	Copyright (C) 2013-2014  xtr4nge [_AT_] gmail.com
+#	Copyright (C) 2013-2015 xtr4nge [_AT_] gmail.com
 #
 #	This program is free software: you can redistribute it and/or modify
 #	it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 import subprocess, os
 
 # get FruityWifi version
-cmd = "cat /usr/share/FruityWifi/www/config/config.php |grep version"
+cmd = "cat /usr/share/fruitywifi/www/config/config.php |grep version"
 f = os.popen(cmd)
 output = f.read()
 version = str(output).replace('\n','').replace('$version="v','').replace('";','')
@@ -66,12 +66,12 @@
 			info['required'] = item.childNodes[0].nodeValue
 
 	# Install module
-	if (float(version)) >= float(info['required']):
+	if (float(version.replace(".",""))) >= float(info['required'].replace(".","")):
 		print info['name'] + " v" + info['version']
-		cmd_install = "git clone https://github.com/xtr4nge/module_"+info['name']+".git /usr/share/FruityWifi/www/modules/"+info['name']
+		cmd_install = "git clone https://github.com/xtr4nge/module_"+info['name']+".git /usr/share/fruitywifi/www/modules/"+info['name']
 		print cmd_install
 		os.system(cmd_install)
-		cmd_install = "cd /usr/share/FruityWifi/www/modules/"+info['name']+"/includes/; chmod 755 install.sh; ./install.sh;"
+		cmd_install = "cd /usr/share/fruitywifi/www/modules/"+info['name']+"/includes/; chmod 755 install.sh; ./install.sh;"
 		os.system(cmd_install)
 		print
 	else: