commit db0e9ec572c678c2a14a5f11bfcb1d4bac272912 parent 13655511de43ce7c76c8ce2b6ff6b9213c9c59f4 Author: Jake Bauer <jbauer@paritybit.ca> Date: Wed, 22 Feb 2023 20:53:16 -0500 Improvements to setup.sh Diffstat:
| M | setup.sh | | | 22 | ++++++++-------------- |
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/setup.sh b/setup.sh @@ -15,28 +15,23 @@ rm -f ~/.bash* # Create directory structure mkdir -p \ - ~/Documents/projects \ + ~/Documents/Projects \ ~/Music \ ~/Pictures \ ~/Downloads \ ~/.ssh # Grab latest dotfiles and apply them to the system -if [ -d ~/Documents/projects/dotfiles ]; then - cd ~/Documents/projects/dotfiles - git pull --ff-only -else - git clone git://git.paritybit.ca/dotfiles ~/Documents/projects/dotfiles - cd ~/Documents/projects/dotfiles -fi +git clone git://git.paritybit.ca/dotfiles ~/Documents/Projects/dotfiles +cd ~/Documents/Projects/dotfiles for file in .????*; do cp -r "$file" ~ done -# Xenodm config -cp xenodm.Xresources /etc/X11/xenodm/Xresources -cp xenodm.Xsetup_0 /etc/X11/xenodm/Xsetup_0 +# Xenodm config (this'll just error out on Linux) +doas cp xenodm.Xresources /etc/X11/xenodm/Xresources +doas cp xenodm.Xsetup_0 /etc/X11/xenodm/Xsetup_0 # Light or dark theme? echo "Light or dark theme (light/dark) [light]: " @@ -51,8 +46,7 @@ fi # Install packages if [ ! -x "$(command -v pkg_add)" ]; then - echo "Looks like this isn't an OpenBSD machine; not auto-installing - packages." + echo "Looks like this isn't an OpenBSD machine; not auto-installing packages." echo "Consider installing equivalents to these:" printf "%s\n" "$(cat pkglist | tr -d '-' | tr '\n' ' ')" else @@ -61,4 +55,4 @@ else echo "Done!" fi -echo "Don't forget to run power-management utilities if on a laptop" +echo "Don't forget to set up/run power-management utilities if on a laptop"