From 1dfb53cc0080b3c69584877c5420509a981cfdcf Mon Sep 17 00:00:00 2001
From: agryphus <agryphus@gmail.com>
Date: Mon, 16 Oct 2023 21:35:57 -0400
Subject: [PATCH] auto_rice script fix

---
 .config/zsh/.zshenv |  2 +-
 scripts/auto_rice   | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv
index f030057..8791ade 100644
--- a/.config/zsh/.zshenv
+++ b/.config/zsh/.zshenv
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-source /opt/miniconda3/etc/profile.d/conda.sh
+# source /opt/miniconda3/etc/profile.d/conda.sh
 
 export BROWSER='firefox'
 export EDITOR='nvim'
diff --git a/scripts/auto_rice b/scripts/auto_rice
index a16648b..5547afb 100755
--- a/scripts/auto_rice
+++ b/scripts/auto_rice
@@ -18,17 +18,24 @@ alias config="git --git-dir $location --work-tree=$HOME"
 config config status.showUntrackedFiles no
 
 # Checkout branch, but move collisions to ~/.config-backup
-mkdir -p "$HOME/.config-backup"
-config checkout 2>&1 \
-    | egrep "\s+\." | awk {'print $1'} \
-    | xargs -I {} mv {} "$HOME/.config-backup/"{}
+if [ ! -e "$location/checked" ]; then
+    mkdir -p "$HOME/.config-backup"
+    config checkout 2>&1 \
+        | egrep "\s+\." | awk {'print $1'} \
+        | xargs -I {} mv {} "$HOME/.config-backup/"{}
 
-# Fix unsafe permissions on gnupg directory
-chmod 700 "$HOME/.local/share/gnupg/"
+    # Fix unsafe permissions on gnupg directory
+    chmod 700 "$HOME/.local/share/gnupg/"
+
+    # Empty file, indicating the repo has been checked out once
+    touch "$location/checked"
+fi
 
 config submodule init
 config submodule update --force --recursive --init --remote
 config submodule foreach "git checkout master"
 
+cd $HOME
+
 exec zsh