changed setup.py; little fixies

Author: merrychap

MANIFEST.in

@@ -0,0 +1 @@
+recursive-include shellen/syscalls *

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name='shellen',
-    version='0.1.1',
+    version='0.1.6',
     description='Interactive environment for crafting shellcodes. Also, it just can be used as a simple assembler/disassembler',
     long_description=long_description,
     url='https://github.com/merrychap/shellen',
@@ -33,8 +33,10 @@
         'License :: OSI Approved :: MIT License',
         'Intended Audience :: Information Technology'
     ],
-    keywords=['shellcode', 'pwn', 'assembler', 'disassembler'],
+    keywords=['shellcode', 'pwn', 'assembler', 'disassembler', 'syscalls'],
     packages=['shellen', 'shellen/opt', 'shellen/asms', 'shellen/syscalls'],
+    include_package_data=True,
+    packge_data={'shellen/syscalls':['linux_tables/*.json']},
     install_requires=['keystone-engine', 'capstone', 'colorama', 'termcolor', 'terminaltables'],
     python_requires='>=3',
     entry_points={

shellen/asms/baseexc.py

@@ -3,7 +3,7 @@
 from archsconf import *
 from opt.appearance import cprint, make_colors
 
-from terminaltables import SingleTable
+from terminaltables import SingleTable, AsciiTable, DoubleTable
 
 from abc import ABC, abstractmethod
 
@@ -107,7 +107,7 @@ def archs(self):
             for j in range(len(filtered)):
                 cur_row.append('' if i >= len(filtered[j]) else make_colors(filtered[j][i]))
             table.append(cur_row)
-        rtable = SingleTable(table)
+        rtable = DoubleTable(table)
         rtable.inner_heading_row_border = False
         return rtable.table
 

shellen/asms/disasm.py

@@ -50,4 +50,5 @@ def __init__(self, arch):
 
     def print_res(self, res):
         for line in res:
-            cprint("\t<cyan>0x{:08X}</>:\t<yellow,bold>{:<8}</><white,bold>{}</>".format(line.address, line.mnemonic, line.op_str))
+            cprint("\t<cyan>0x{:08X}</>:\t<yellow,bold>{:<8}</><white,bold>{}</>".format(line.address, line.mnemonic, line.op_str))
+        cprint('\n')

shellen/fetcher.py

@@ -5,7 +5,7 @@
 
 from opt.appearance import cprint, make_colors
 
-from terminaltables import SingleTable
+from terminaltables import SingleTable, DoubleTable
 
 
 SHELL_URL = 'http://shell-storm.org/api/?s={}'
@@ -73,7 +73,7 @@ def __get_colored_row(self, row):
     def fetch_table(self, pattern, os='linux', arch=X86_32, count=0):
         cprint('\n<magenta,bold>[*]</> Connecting to shell-storm.org...')
         rowtable = self.fetch(pattern, os, arch, count, True)
-        return SingleTable(rowtable)
+        return DoubleTable(rowtable)
 
     def sort_rows(self, table, count):
         def bytes_len(row):

shellen/shell.py

@@ -181,7 +181,7 @@ def dsm(self):
             cprint('\n<green>[+]</> Changed to <white,underline>dsm</> (disassembly) mode\n')
 
     def archs(self):
-        cprint(self.pexec.archs())
+        cprint('\n' + self.pexec.archs() + '\n')
 
     def clear(self):
         os.system('cls' if os.name == 'nt' else 'clear')

shellen/syscalls/base_handler.py

@@ -7,7 +7,7 @@
 
 from difflib import SequenceMatcher
 
-from terminaltables import SingleTable
+from terminaltables import SingleTable, DoubleTable
 
 
 EMPTY_VALUE = '-'
@@ -53,7 +53,7 @@ def get_table(self, arch, pattern, colored=False, verbose=False):
                 value = command[hd]
                 cur_tb_field.append(self.__make_colored_field(value, hd, verbose=verbose))
             table.append(cur_tb_field)
-        return SingleTable(table)
+        return DoubleTable(table)
 
     def __make_colored_field(self, field, hd, verbose=False):
         if hd == NAME_FIELD: