1
0
Fork 0
mirror of https://github.com/notwa/rc synced 2024-11-05 08:19:03 -08:00

rewrite is_empty into install script

This commit is contained in:
Connor Olding 2019-06-05 18:24:02 -07:00
parent 4744d3dc5d
commit d6bc56a9c3

13
install
View file

@ -114,7 +114,6 @@ which readlink >/dev/null || exit 1 # sanity check
rc="$(readlink -f "$(dirname "$0")" )" rc="$(readlink -f "$(dirname "$0")" )"
cd "$HOME" cd "$HOME"
PATH="${PATH:?No existing PATH}:$rc/sh"
backup_dir="$rc/backup-$(date -u '+%s')" backup_dir="$rc/backup-$(date -u '+%s')"
@ -136,9 +135,21 @@ if [ ! -e .bash_profile ] || ! grep -qF .bashrc .bash_profile; then
echo '[[ -f ~/.bashrc ]] && . ~/.bashrc' >> .bash_profile echo '[[ -f ~/.bashrc ]] && . ~/.bashrc' >> .bash_profile
fi fi
is_empty() {
local f="${1:?is_empty requires an argument}"
find "$f" -type f | while read -r f; do
return 1
done || return 1 # just in case pipes mess things up
return 0
}
# delete any directory structure that may have been included with the OS.
# note that i'm careful not to delete them if they contain even a single file,
# but you might still want to remove this if you're adapting my install script.
for d in Desktop Documents Downloads Music Pictures Public Templates Video Videos; do for d in Desktop Documents Downloads Music Pictures Public Templates Video Videos; do
[ -d "$d" ] || continue [ -d "$d" ] || continue
is_empty "$d" && rm -r "$d" || note "not removing $d because it contains files" is_empty "$d" && rm -r "$d" || note "not removing $d because it contains files"
done done
# create instead my preferred directory structure.
mkdir -p opt/local/bin src work play mkdir -p opt/local/bin src work play