diff --git a/bin/actions/help.sh b/bin/actions/help.sh index 1d1a85e..b1b7aef 100755 --- a/bin/actions/help.sh +++ b/bin/actions/help.sh @@ -3,7 +3,7 @@ source $HOME/dotfiles/bin/helpers/functions.sh # Print logo -echo "Menno's Dotfiles" | figlet | lolcat +logo # Print help cat $HOME/dotfiles/bin/resources/help.txt diff --git a/bin/helpers/functions.sh b/bin/helpers/functions.sh index c094c4b..b32da2f 100755 --- a/bin/helpers/functions.sh +++ b/bin/helpers/functions.sh @@ -17,9 +17,13 @@ is_wsl() { logo() { echo "Menno's Dotfiles" | figlet | lolcat + if [[ $(trash-list | wc -l) -gt 0 ]]; then + printfe "%s" "yellow" "[!] $(trash-list | wc -l | tr -d ' ') file(s) in trash - " + fi + # Print if repo is dirty and the count of untracked files, modified files and staged files if [[ $(git -C ~/dotfiles status --porcelain) ]]; then - printfe "%s" "yellow" "dotfiles repo is dirty " + printfe "%s" "yellow" "dotfiles is dirty " printfe "%s" "red" "[$(git -C ~/dotfiles status --porcelain | grep -c '^??')] untracked " printfe "%s" "yellow" "[$(git -C ~/dotfiles status --porcelain | grep -c '^ M')] modified " printfe "%s" "green" "[$(git -C ~/dotfiles status --porcelain | grep -c '^M ')] staged " @@ -29,6 +33,7 @@ logo() { if [[ $(git -C ~/dotfiles log origin/master..HEAD) ]]; then printfe "%s" "yellow" "[!] You have $(git -C ~/dotfiles log origin/master..HEAD --oneline | wc -l | tr -d ' ') commit(s) to push" fi + println "" "normal" } diff --git a/bin/resources/help.txt b/bin/resources/help.txt index 4396fb5..9d27261 100755 --- a/bin/resources/help.txt +++ b/bin/resources/help.txt @@ -1,11 +1,9 @@ -All [] are optional parameters. And all <> are required parameters. -Usage: dotf [options] [optional parameters] +Usage: dotf [OPTIONS] [ARGS] update: Pull latest changes, and update symlinks and configurations. - status: Show the status of the dotfiles repository. secrets: Encrypt and decrypt secrets. - auto-start: Runs various programs for easy startup in case GNOME doesn't properly auto-start them. - term: Shows the welcome message for the terminal and the current dotfiles git status. + auto-start: Start a set of pre-defined applications. + term: Shows the welcome message for the terminal. help: Shows this help message \ No newline at end of file