set package path in development modev1.4.4

2 files changed, 7 insertions, 3 deletions

diff --git a/awall-cli b/awall-cli
index b9a60ad..13aafc9 100755
--- a/awall-cli
+++ b/awall-cli
@@ -114,6 +114,12 @@ if not mode then
 end
 
 
+dev_mode = stringy.endswith(arg[0], '/awall-cli')
+if dev_mode then
+   basedir = arg[0]:sub(1, -11)
+   package.path = basedir..'/?/init.lua;'..basedir..'/?.lua;'..package.path
+end
+
 util = require('awall.util')
 contains = util.contains
 printmsg = util.printmsg
@@ -139,8 +145,7 @@ for i, cls in ipairs{'mandatory', 'optional', 'private'} do
    if path then pol_paths[cls] = util.split(path, ':') end
 end
 
-if stringy.endswith(arg[0], '/awall-cli') then
-   basedir = arg[0]:sub(1, -11)
+if dev_mode then
    util.setdefault(pol_paths, 'mandatory', {'/etc/awall'})
    table.insert(pol_paths.mandatory, basedir..'/json')
 end
diff --git a/awall.lua b/awall.lua
deleted file mode 120000
index 9a3d9cc..0000000
--- a/awall.lua
+++ /dev/null
@@ -1 +0,0 @@
-awall/init.lua
\ No newline at end of file