Subject: Changes in Oscad Installation Script

Description: Modified Oscad installation script to install it in one
run. Also make few permission changes for desktop icon of OSCAD.

OSCAD/Examples/bridgeRectifier/1n4007.lib

@@ -1,3 +1,2 @@
-.model 1n4007 D( CJO=1E-11 AF=1 EG=1.05743 IS=7.02767e-09 RS=0.0341512 
-+ M=0.5 N=1.80803 BV=1000 FC=0.5 XTI=5 
-+ TT=1E-07 VJ=0.7 IBV=5e-08 KF=0 )
+.model 1n4007 D( IS=7.02767e-09 RS=0.0341512 N=1.80803 EG=1.05743 XTI=5 BV=1000 IBV=5e-08 CJO=1E-11 
++VJ=0.7 M=0.5 FC=0.5 TT=1E-07 KF=0 AF=1 )

checkPythonModules.py

@@ -23,15 +23,30 @@ def checkPackage(package):
       time.sleep(2)
     except ImportError:
       pass
-    try:
+
+    ############################# changes made by Amardeepsingh 12/6/2014 - 7pm
+    with open (os.getcwd()+"/pypkgExitStatus") as f2:
+        lines = f2.read()
+
+    lines = lines.split("\n")
+    if lines[0] != '0':	
+      print "Unable to find "+packageName
+      print "Please re-run the ./installOSCAD.sh If you are getting this error first time"
+      print '\033[91m'+ "  Please Install Python Library: " + libraryName + " using package manager"+ '\033[0m' 
+      exit(1)
+
+    #############################
+
+
+    '''try:
       __import__(packageName)
     except ImportError:
       print "Unable to find "+packageName
       print "Please re-run the ./installOSCAD.sh If you are getting this error first time"
       print '\033[91m'+ "  Please Install Python Library: " + libraryName + " using package manager"+ '\033[0m' 
-      exit(1)
+      exit(1)'''
   print "  Found python module: " +packageName
 
-packageList=[["wx","python-wxgtk2.8 wx-common"],["re","re"],["Image","python-imaging"],["ImageTk","python-imaging-tk"],["string","string"],["Tkinter","python-tk"],["Pmw","python-pmw"]]
+packageList=[["wx","python-wxgtk2.8 wx-common"],["re","re"],["Image","python-imaging"],["ImageTk","python-imaging-tk"],["string","string"],["Tkinter","python-tk"],["Pmw","python-pmw"],["PyQt4","python-qt4"],["matplotlib","python-matplotlib"]]
 for package in packageList:
   checkPackage(package)

installModule.sh

@@ -10,5 +10,9 @@ echo -n "Installing "
 echo -n $1 
 echo "................."
  sudo apt-get install $1
-
-
+ if [ $? -ne 1 ]
+ then 
+     echo 0 > pypkgExitStatus
+ else
+     echo 1 > pypkgExitStatus
+ fi

installOSCAD.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-
+#
 # installOSCAD.sh is a part of OSCAD.
 # Original Author: Yogesh Dilip Save ([email protected])
 # Copyright (C) 2012 Yogesh Dilip Save, FOSS Project, IIT Bombay.
@@ -249,6 +249,13 @@ else
 fi
 echo "Installation started..............."
 
+if [ -d $installDir/OSCAD ]
+then
+echo "Renaming your old OSCAD folder to OSCAD.bak"
+mv -r $installDir/OSCAD $installDir/OSCAD.bak
+fi
+echo "Outof if loop"
+
 #tar -zxvf OSCAD.tar.gz -C $installDir
 cp -rv OSCAD $installDir