Browse Source

install package once in installer.py

Simon Oberhammer 12 years ago
parent
commit
7703d14eda
2 changed files with 1 additions and 6 deletions
  1. 1 0
      installer.py
  2. 0 6
      ringojs/setup.py

+ 1 - 0
installer.py

@@ -123,6 +123,7 @@ class Installer:
     self.__run_command("sudo apt-get install jsvc")
     self.__run_command("sudo apt-get install jsvc")
     self.__run_command("sudo dpkg -i ringojs_0.9-1_all.deb")
     self.__run_command("sudo dpkg -i ringojs_0.9-1_all.deb")
     self.__run_command("rm ringojs_0.9-1_all.deb")
     self.__run_command("rm ringojs_0.9-1_all.deb")
+    self.__run_command("sudo ringo-admin install oberhamsi/sql-ringojs-client")
 
 
     #######################################
     #######################################
     # Webservers
     # Webservers

+ 0 - 6
ringojs/setup.py

@@ -7,12 +7,6 @@ import os
 def start(args):
 def start(args):
   setup_util.replace_text("ringojs/ringo-main.js", "dbHost = '.*';", "dbHost = '" + args.database_host + "';")
   setup_util.replace_text("ringojs/ringo-main.js", "dbHost = '.*';", "dbHost = '" + args.database_host + "';")
 
 
-  try:
-    subprocess.check_call("sudo ringo-admin install oberhamsi/sql-ringojs-client", shell=True, cwd="ringojs")
-  except:
-    # already installed
-    pass
-
   try:
   try:
     subprocess.check_call("ringo --production ringo-main.js", shell=True, cwd="ringojs")
     subprocess.check_call("ringo --production ringo-main.js", shell=True, cwd="ringojs")
     return 0
     return 0