From 35f495d293f44159bf63488f3dbb31499f25c800 Mon Sep 17 00:00:00 2001
From: Nathan Schneider <nathan.schneider@colorado.edu>
Date: Mon, 18 May 2020 22:29:37 +0000
Subject: [PATCH] Set Zotero installation method to flatpak rather than .deb in
 install-deb.sh

---
 .scripts/install-arch.sh |  2 +-
 .scripts/install-deb.sh  | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.scripts/install-arch.sh b/.scripts/install-arch.sh
index 1861e43..1cb0a4f 100644
--- a/.scripts/install-arch.sh
+++ b/.scripts/install-arch.sh
@@ -40,6 +40,6 @@ cd ~
 
 # zotero
 sudo snap install zotero
-# If we change location, update that in .emacs AND pandout.sh script
+# If we change data location from the default ~/Zotero, update that in .emacs AND pandout.sh
 
 echo "Installation script complete"
diff --git a/.scripts/install-deb.sh b/.scripts/install-deb.sh
index e424d05..ac104ed 100644
--- a/.scripts/install-deb.sh
+++ b/.scripts/install-deb.sh
@@ -4,8 +4,9 @@
 echo "Beginning install script for ntnsndr Deb environment"
 
 # First, some basic utilities
-sudo apt-get -y install xdg-open
-sudo apt-get install nodejs
+sudo apt -y install xdg-open
+sudo apt -y install nodejs
+sudo apt -y install flatpak
 # TO DO git
 
 # Next, core apps (or are these already done by this point in order to get GitLab access?)
@@ -13,15 +14,15 @@ sudo apt-get install nodejs
 # TO DO keepassxc
 
 # emacs
-sudo apt-get -y install emacs-gtk
-sudo apt-get -y install aspell aspell-en
+sudo apt -y install emacs-gtk
+sudo apt -y install aspell aspell-en
 emacs --script ~/.scripts/install-emacs.el
 
 # pandoc
-sudo apt-get -y install pandoc
-sudo apt-get -y install pandoc-citeproc
-sudo apt-get -y install texlive
-sudo apt-get -y install lmodern
+sudo apt -y install pandoc
+sudo apt -y install pandoc-citeproc
+sudo apt -y install texlive
+sudo apt -y install lmodern
 
 # revealjs
 cd ~/.revealjs
@@ -32,11 +33,10 @@ cp ~/.revealjs/ntn.css ~/.revealjs/reveal.js/css/theme/
 cd ~
 
 # zotero
-echo "Go to https://www.zotero.org/download/, download, and put contents in /opt/zotero/ (using sudo)"
-echo "Done? Hit Enter"
+echo "Restart the computer to finish flatpak installation, then run"
+echo "flatpak install flathub org.zotero.Zotero"
+echo "Good?"
 read response
-sudo /opt/zotero/set_launcher_icon
-ln -s /opt/zotero/zotero.desktop ~/.local/share/applications/zotero.desktop
-# If we change location, update that in .emacs AND pandout.sh script
+# If we change data location from the default ~/Zotero, update that in .emacs AND pandout.sh
 
 echo "Installation script complete"