Merge pull request #150 from rahulp13/installers

desktop launcher as trusted app, update readme

2 files changed, 38 insertions, 8 deletions

diff --git a/Debian/install-eSim.sh b/Debian/install-eSim.sh
index d3c2f251..53a265c1 100755
--- a/Debian/install-eSim.sh
+++ b/Debian/install-eSim.sh
@@ -221,6 +221,17 @@ function createDesktopStartScript
     sudo chmod 755 esim.desktop
     # Copy desktop icon file to Desktop
     cp -vp esim.desktop $HOME/Desktop/
+
+    # Check if the target OS is Ubuntu 18 or not
+    if [[ $(lsb_release -rs) == 18.* ]]; then
+        # Make esim.desktop file as trusted application
+        gio set $HOME/Desktop/esim.desktop "metadata::trusted" yes
+        # Restart nautilus-desktop, so that the changes take effect
+        killall nautilus-desktop && nautilus-desktop &
+    fi
+
+    # Remove local copy of esim.desktop file
+    rm esim.desktop
     # Copying logo.png to .esim directory to access as icon
     cp -vp images/logo.png $config_dir
 
@@ -317,7 +328,7 @@ elif [ $option == "--uninstall" ];then
     read getConfirmation
     if [ $getConfirmation == "y" -o $getConfirmation == "Y" ];then
         echo "Removing eSim............................"
-        sudo rm -rf $HOME/.esim $HOME/Desktop/esim.desktop esim.desktop /usr/bin/esim
+        sudo rm -rf $HOME/.esim $HOME/Desktop/esim.desktop /usr/bin/esim
         echo "Removing KiCad..........................."
         sudo apt purge -y kicad
         sudo rm -rf /usr/share/kicad
diff --git a/Debian/readme.md b/Debian/readme.md
index c907fb0a..8b635e4a 100755
--- a/Debian/readme.md
+++ b/Debian/readme.md
@@ -2,7 +2,7 @@ eSim Installer (Ubuntu OS)
 ====
 
 
-It contains all the documenation for making eSim executable (using PyInstaller) and eSim Installation Script on Ubuntu 16.04 and above.
+It contains all the documenation for making eSim executable (using PyInstaller), eSim Installation Script and packaging eSim with and without eSim executable (through source) on Ubuntu 16.04 and above.
 
 
 ## eSim Executable:
@@ -74,7 +74,7 @@ It contains all the documenation for making eSim executable (using PyInstaller)
 9. Verify whether all eSim `src` files (`*.py`) have been included in `Analysis-00.toc` file under the build folder generated by PyInstaller.
 
 
-## Fully-Static Bundled Version of eSim:
+## Fully-Static Bundling of eSim Executable:
 
 1. To create a [fully-static bundled version](https://github.com/pyinstaller/pyinstaller/wiki/FAQ#GNULinux) of eSim (through PyInstaller), use a tool like [StaticX](https://github.com/JonathonReinhart/staticx/).
 
@@ -82,26 +82,45 @@ It contains all the documenation for making eSim executable (using PyInstaller)
 
 	- Activate the virtual environment as:
 	
-		$ source eSim/bin/activate
+			$ source eSim/bin/activate
 
 	- Install StaticX as:
 
-		$ pip install staticx
-		$ pip install patchelf-wrapper
+			$ pip install staticx
+			$ pip install patchelf-wrapper
 
 	- Create static eSim as:
 
-		$ staticx /path/to/executable/eSim /path/to/output/executable/eSim
+			$ staticx /path/to/executable/eSim /path/to/output/executable/eSim
 
 3. To verify if all dynamic libraries are removed :
 	
 	- Type following command in a terminal :
 
-		$ ldd path/to/output/executable/eSim
+			$ ldd path/to/output/executable/eSim
 
 	- Output of above command should be similar to `	not a dynamic executable`
 
 
+## Without eSim Executable (through source):
+
+Update following files by changing the relative paths before packaging the `src` folder with the release.
+
+	- `browser\UserManual.py` 				--> 	path to manual
+	- `browser\Welcome.py`					--> 	path to library
+	- `configuration\Appconfig.py`			--> 	path to library
+    - `frontEnd\Application.py`				--> 	path to library, pathmagic and images
+    - `frontEnd\ProjectExplorer.py`			--> 	path to images
+    - `frontEnd\Workspace.py`				--> 	path to images
+    - `kicadtoNgspice\DeviceModel.py` 		--> 	path to library
+    - `kicadtoNgspice\Processing.py` 		--> 	path to library
+    - `kicadtoNgspice\SubcircuitTab.py` 	--> 	path to library
+    - `modelEditor\ModelEditor.py`			--> 	path to library
+    - `subcircuit\newSub.py`				--> 	path to library
+    - `subcircuit\openSub.py`				--> 	path to library
+    - `subcircuit\uploadSub.py`				--> 	path to library
+
+
 ## How to package eSim?
 
 1. Update `VERSION` file to this release number.