diff options
| -rw-r--r-- | OSCAD/Examples/bridgeRectifier/1n4007.lib | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | checkMetanet.sci | 0 | ||||
| -rwxr-xr-x | checkPythonModules.py | 21 | ||||
| -rwxr-xr-x[-rw-r--r--] | installMetanet.sci | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | installModule.sh | 8 | ||||
| -rwxr-xr-x | installOSCAD.sh | 9 | ||||
| -rwxr-xr-x[-rw-r--r--] | oscad.desktop | 0 | ||||
| l--------- | scilab54 | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | setProxy.sh | 0 |
9 files changed, 34 insertions, 10 deletions
diff --git a/OSCAD/Examples/bridgeRectifier/1n4007.lib b/OSCAD/Examples/bridgeRectifier/1n4007.lib index 7de0312..89d421d 100644 --- a/OSCAD/Examples/bridgeRectifier/1n4007.lib +++ b/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 )
\ No newline at end of file +.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 ) diff --git a/checkMetanet.sci b/checkMetanet.sci index 021a99e..021a99e 100644..100755 --- a/checkMetanet.sci +++ b/checkMetanet.sci diff --git a/checkPythonModules.py b/checkPythonModules.py index bf4b69b..deb116b 100755 --- a/checkPythonModules.py +++ b/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) diff --git a/installMetanet.sci b/installMetanet.sci index 0e57e08..0e57e08 100644..100755 --- a/installMetanet.sci +++ b/installMetanet.sci diff --git a/installModule.sh b/installModule.sh index 4533bd7..9234d94 100644..100755 --- a/installModule.sh +++ b/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 diff --git a/installOSCAD.sh b/installOSCAD.sh index 4cb733b..46e55fe 100755 --- a/installOSCAD.sh +++ b/installOSCAD.sh @@ -1,5 +1,5 @@ #!/bin/bash - +# # installOSCAD.sh is a part of OSCAD. # Original Author: Yogesh Dilip Save (yogessave@gmail.com) # 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 diff --git a/oscad.desktop b/oscad.desktop index 93d09b3..93d09b3 100644..100755 --- a/oscad.desktop +++ b/oscad.desktop diff --git a/scilab54 b/scilab54 deleted file mode 120000 index 4385208..0000000 --- a/scilab54 +++ /dev/null @@ -1 +0,0 @@ -/home/ttt/OSCAD/bin/scilab54
\ No newline at end of file diff --git a/setProxy.sh b/setProxy.sh index 55912fb..55912fb 100644..100755 --- a/setProxy.sh +++ b/setProxy.sh |