From 415f460d62f76d3d6b70a65b57a36bb361302424 Mon Sep 17 00:00:00 2001
From: rahulp13
Date: Tue, 15 Dec 2020 23:51:31 +0530
Subject: disabled exit on error for apt update

---
 Ubuntu/install-eSim.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'Ubuntu/install-eSim.sh')

diff --git a/Ubuntu/install-eSim.sh b/Ubuntu/install-eSim.sh
index 8ce35553..bedd34cb 100755
--- a/Ubuntu/install-eSim.sh
+++ b/Ubuntu/install-eSim.sh
@@ -15,7 +15,7 @@
 #        AUTHOR: Fahim Khan, Rahul Paknikar, Saurabh Bansode
 #  ORGANIZATION: eSim Team, FOSSEE, IIT Bombay
 #       CREATED: Wednesday 15 July 2015 15:26
-#      REVISION: Sunday 02 August 2020 01:26
+#      REVISION: Wednesday 15 December 2020 23:50
 #===============================================================================
 
 # All variables goes here
@@ -104,10 +104,16 @@ function addKicadPPA
 function installDependency
 {
 
+    set +e      # Temporary disable exit on error
+    trap "" ERR # Do not trap on error of any command
+
 	#Update apt repository
 	echo "Updating apt index files..................."
     sudo apt-get update
     
+    set -e      # Re-enable exit on error
+    trap error_exit ERR
+    
     echo "Installing Xterm..........................."
     sudo apt-get install -y xterm
 
@@ -123,7 +129,7 @@ function installDependency
 	fi
 
     echo "Installing KiCad..........................."
-    sudo apt-get install -y --no-install-recommends kicad
+    sudo apt-get install -y --no-install-recommends kicad=4.0.7*
     if [[ $(lsb_release -rs) == 20.* ]]; then
         sudo add-apt-repository -r "deb http://in.archive.ubuntu.com/ubuntu/ bionic main universe"
     fi
-- 
cgit 


From ca83e94e61353e2cce160f6fa822f01d7d8b0393 Mon Sep 17 00:00:00 2001
From: rahulp13
Date: Thu, 17 Dec 2020 00:52:29 +0530
Subject: fixed key issue with bionic repo

---
 Ubuntu/install-eSim.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'Ubuntu/install-eSim.sh')

diff --git a/Ubuntu/install-eSim.sh b/Ubuntu/install-eSim.sh
index bedd34cb..27783e41 100755
--- a/Ubuntu/install-eSim.sh
+++ b/Ubuntu/install-eSim.sh
@@ -15,7 +15,7 @@
 #        AUTHOR: Fahim Khan, Rahul Paknikar, Saurabh Bansode
 #  ORGANIZATION: eSim Team, FOSSEE, IIT Bombay
 #       CREATED: Wednesday 15 July 2015 15:26
-#      REVISION: Wednesday 15 December 2020 23:50
+#      REVISION: Wednesday 16 December 2020 23:50
 #===============================================================================
 
 # All variables goes here
@@ -90,7 +90,8 @@ function addKicadPPA
             echo "Package: kicad" | sudo tee -a /etc/apt/preferences.d/preferences > /dev/null
             echo "Pin: version 4.0.7*" | sudo tee -a /etc/apt/preferences.d/preferences > /dev/null
             echo "Pin-Priority: 501" | sudo tee -a /etc/apt/preferences.d/preferences > /dev/null
-            sudo add-apt-repository --yes "deb http://in.archive.ubuntu.com/ubuntu/ bionic main universe"
+            sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
+            sudo add-apt-repository --yes "deb http://archive.ubuntu.com/ubuntu/ bionic main universe"
         else
             sudo add-apt-repository --yes ppa:js-reynaud/kicad-4
         fi
@@ -131,7 +132,7 @@ function installDependency
     echo "Installing KiCad..........................."
     sudo apt-get install -y --no-install-recommends kicad=4.0.7*
     if [[ $(lsb_release -rs) == 20.* ]]; then
-        sudo add-apt-repository -r "deb http://in.archive.ubuntu.com/ubuntu/ bionic main universe"
+        sudo add-apt-repository -ry "deb http://archive.ubuntu.com/ubuntu/ bionic main universe"
     fi
 
 }
-- 
cgit 


From 376e748df438933088721286402462dffd6367c0 Mon Sep 17 00:00:00 2001
From: rahulp13
Date: Tue, 5 Jan 2021 19:48:02 +0530
Subject: auto-add kicad-4 key for ubuntu 20+

---
 Ubuntu/install-eSim.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Ubuntu/install-eSim.sh')

diff --git a/Ubuntu/install-eSim.sh b/Ubuntu/install-eSim.sh
index 27783e41..ae2be5b0 100755
--- a/Ubuntu/install-eSim.sh
+++ b/Ubuntu/install-eSim.sh
@@ -15,7 +15,7 @@
 #        AUTHOR: Fahim Khan, Rahul Paknikar, Saurabh Bansode
 #  ORGANIZATION: eSim Team, FOSSEE, IIT Bombay
 #       CREATED: Wednesday 15 July 2015 15:26
-#      REVISION: Wednesday 16 December 2020 23:50
+#      REVISION: Wednesday 05 January 2021 23:50
 #===============================================================================
 
 # All variables goes here
@@ -85,7 +85,8 @@ function addKicadPPA
     if [ -z "$findppa" ]; then
         echo "Adding KiCad-4 PPA to local apt-repository"
         if [[ $(lsb_release -rs) == 20.* ]]; then
-            sudo add-apt-repository --yes "deb http://ppa.launchpad.net/js-reynaud/kicad-4/ubuntu bionic main"
+            sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 83FBAD2D910F124E
+            sudo add-apt-repository --yes "deb [trusted=yes] http://ppa.launchpad.net/js-reynaud/kicad-4/ubuntu bionic main"
             sudo touch /etc/apt/preferences.d/preferences
             echo "Package: kicad" | sudo tee -a /etc/apt/preferences.d/preferences > /dev/null
             echo "Pin: version 4.0.7*" | sudo tee -a /etc/apt/preferences.d/preferences > /dev/null
-- 
cgit