andrew/nixrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto_rice script fix

Browse source
This commit is contained in:
agryphus 2023-10-16 21:35:57 -04:00
parent da9e214ddd
commit 1dfb53cc00
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.config/zsh/.zshenv
View file

@ -1,6 +1,6 @@
#!/bin/zsh #!/bin/zsh
source /opt/miniconda3/etc/profile.d/conda.sh # source /opt/miniconda3/etc/profile.d/conda.sh
export BROWSER='firefox' export BROWSER='firefox'
export EDITOR='nvim' export EDITOR='nvim'

7
scripts/auto_rice
View file

@ -18,6 +18,7 @@ alias config="git --git-dir $location --work-tree=$HOME"
config config status.showUntrackedFiles no config config status.showUntrackedFiles no
# Checkout branch, but move collisions to ~/.config-backup # Checkout branch, but move collisions to ~/.config-backup
if [ ! -e "$location/checked" ]; then
mkdir -p "$HOME/.config-backup" mkdir -p "$HOME/.config-backup"
config checkout 2>&1 \ config checkout 2>&1 \
| egrep "\s+\." | awk {'print $1'} \ | egrep "\s+\." | awk {'print $1'} \
@ -26,9 +27,15 @@ config checkout 2>&1 \
# Fix unsafe permissions on gnupg directory # Fix unsafe permissions on gnupg directory
chmod 700 "$HOME/.local/share/gnupg/" 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 init
config submodule update --force --recursive --init --remote config submodule update --force --recursive --init --remote
config submodule foreach "git checkout master" config submodule foreach "git checkout master"
cd $HOME
exec zsh exec zsh