Skip to content

Commit

Permalink
Update setup.py to not cd into the src directory
Browse files Browse the repository at this point in the history
  • Loading branch information
devttys0 committed Jun 21, 2016
1 parent a823ab6 commit 291a035
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
raw_input = input

# cd into the src directory, no matter where setup.py was invoked from
os.chdir(os.path.join(os.path.dirname(os.path.realpath(__file__)), "src"))
#os.chdir(os.path.join(os.path.dirname(os.path.realpath(__file__)), "src"))

def which(command):
# /usr/local/bin is usually the default install path, though it may not be in $PATH
Expand Down Expand Up @@ -80,7 +80,7 @@ class IDAUnInstallCommand(Command):

def initialize_options(self):
self.idadir = None
self.mydir = os.path.dirname(os.path.realpath(__file__))
self.mydir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "src")

def finalize_options(self):
pass
Expand Down Expand Up @@ -108,7 +108,7 @@ class IDAInstallCommand(Command):

def initialize_options(self):
self.idadir = None
self.mydir = os.path.dirname(os.path.realpath(__file__))
self.mydir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "src")

def finalize_options(self):
pass
Expand Down Expand Up @@ -207,9 +207,10 @@ def run(self):
url = "https://github.com/devttys0/%s" % MODULE_NAME,

requires = [],
package_dir = {"" : "src"},
packages = [MODULE_NAME],
package_data = {MODULE_NAME : install_data_files},
scripts = [os.path.join("scripts", SCRIPT_NAME)],
scripts = [os.path.join("src", "scripts", SCRIPT_NAME)],

cmdclass = {'clean' : CleanCommand, 'uninstall' : UninstallCommand, 'idainstall' : IDAInstallCommand, 'idauninstall' : IDAUnInstallCommand}
)
Expand Down

0 comments on commit 291a035

Please sign in to comment.