Integrates Ubuntu 24.04LTS default bash config and fixes anonymous functions to work properly in bash.

.bash_logout

@@ -0,0 +1,7 @@
+# ~/.bash_logout: executed by bash(1) when login shell exits.
+
+# when leaving the console clear the screen to increase privacy
+
+if [ "$SHLVL" = 1 ]; then
+    [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q
+fi

.bashrc

@@ -0,0 +1,151 @@
+# ~/.bashrc: executed by bash(1) for non-login shells.
+# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
+# for examples
+
+# If not running interactively, don't do anything
+case $- in
+    *i*) ;;
+      *) return;;
+esac
+
+# If set, the pattern "**" used in a pathname expansion context will
+# match all files and zero or more directories and subdirectories.
+#shopt -s globstar
+
+# make less more friendly for non-text input files, see lesspipe(1)
+[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+# set a fancy prompt (non-color, unless we know we "want" color)
+case "$TERM" in
+    xterm-color|*-256color) color_prompt=yes;;
+esac
+
+# uncomment for a colored prompt, if the terminal has the capability; turned
+# off by default to not distract the user: the focus in a terminal window
+# should be on the output of commands, not on the prompt
+#force_color_prompt=yes
+
+if [ -n "$force_color_prompt" ]; then
+    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+	# We have color support; assume it's compliant with Ecma-48
+	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+	# a case would tend to support setf rather than setaf.)
+	color_prompt=yes
+    else
+	color_prompt=
+    fi
+fi
+
+if [ "$color_prompt" = yes ]; then
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+else
+    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+unset color_prompt force_color_prompt
+
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm*|rxvt*)
+    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+    ;;
+*)
+    ;;
+esac
+
+# enable color support of ls and also add handy aliases
+if [ -x /usr/bin/dircolors ]; then
+    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    alias ls='ls --color=auto'
+    #alias dir='dir --color=auto'
+    #alias vdir='vdir --color=auto'
+
+    alias grep='grep --color=auto'
+    alias fgrep='fgrep --color=auto'
+    alias egrep='egrep --color=auto'
+fi
+
+# colored GCC warnings and errors
+#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+
+# some more ls aliases
+alias ll='ls -alF'
+alias la='ls -A'
+alias l='ls -CF'
+
+# Add an "alert" alias for long running commands.  Use like so:
+#   sleep 10; alert
+alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
+
+# Alias definitions.
+# You may want to put all your additions into a separate file like
+# ~/.bash_aliases, instead of adding them here directly.
+# See /usr/share/doc/bash-doc/examples in the bash-doc package.
+
+if [ -f ~/.bash_aliases ]; then
+    . ~/.bash_aliases
+fi
+
+## Begin .rc.d stuff
+
+## Homebrew
+# Consider moving this to a .rc.d script.
+# If Apple Silicon Homebrew is installed activate it.
+if [ -x "/usr/local/homebrew/bin/brew" ]; then
+    eval "$(/usr/local/homebrew/bin/brew shellenv)"
+    # If x86_64 Homebrew is installed alias it to brew86.
+    if [ -x "/opt/homebrew/bin/brew" ]; then
+        alias brew86='arch -x86_64 /usr/local/homebrew/bin/brew'
+    fi
+fi
+
+# If x86_64 Homebrew is installed activate it.
+if [ -x "/opt/homebrew/bin/brew" ]; then
+    eval "$(/opt/homebrew/bin/brew shellenv)"
+    # If Apple Silicon Homebrew is installed alias it to brewarm.
+    if [ -x "/usr/local/homebrew/bin/brew" ]; then
+        alias brewarm='arch -arm64 /opt/homebrew/bin/brew'
+    fi
+fi
+
+## Source all scripts in ~/.rc.d
+for f in ~/.rc.d/*.sh; do
+   source "$f"
+done
+
+
+## Autocompletion
+
+# enable programmable completion features (you don't need to enable
+# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
+# sources /etc/bash.bashrc).
+if ! shopt -oq posix; then
+  if [ -f /usr/share/bash-completion/bash_completion ]; then
+    . /usr/share/bash-completion/bash_completion
+  elif [ -f /etc/bash_completion ]; then
+    . /etc/bash_completion
+  fi
+fi
+
+## Functions
+
+## Configure History
+# don't put duplicate lines or lines starting with space in the history.
+# See bash(1) for more options
+HISTCONTROL=ignoreboth
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
+HISTSIZE=1000
+HISTFILESIZE=2000
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+

.profile

@@ -0,0 +1,28 @@
+# ~/.profile: executed by the command interpreter for login shells.
+# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
+# exists.
+# see /usr/share/doc/bash/examples/startup-files for examples.
+# the files are located in the bash-doc package.
+
+# the default umask is set in /etc/profile; for setting the umask
+# for ssh logins, install and configure the libpam-umask package.
+#umask 022
+
+# TODO: Do this for zsh and exec $HOME/.zshrc?
+# if running bash
+if [ -n "$BASH_VERSION" ]; then
+    # include .bashrc if it exists
+    if [ -f "$HOME/.bashrc" ]; then
+	. "$HOME/.bashrc"
+    fi
+fi
+
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/bin" ] ; then
+    PATH="$HOME/bin:$PATH"
+fi
+
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/.local/bin" ] ; then
+    PATH="$HOME/.local/bin:$PATH"
+fi

.rc.d/icu.sh

@@ -1,4 +1,4 @@
-function {
+function anon() {
   local icu_path=/opt/homebrew/opt/icu4c
   local bin_path=$icu_path/bin
   local sbin_path=$icu_path/sbin
@@ -9,3 +9,4 @@ function {
     path=($sbin_path $path)
   fi
 }
+unset -f anon

.rc.d/iterm2.sh

@@ -1,6 +1,7 @@
-function {
+function anon() {
     local script_path="$HOME/.iterm2_shell_integration.zsh"
     if [ "$TERM_PROGRAM" = "iTerm.app" -a -e "$script_path" ]; then
         source "$script_path"
     fi
 }
+unset -f anon

.rc.d/nvm.sh

@@ -1,4 +1,4 @@
-function {
+function anon() {
   local nvm_dir="$HOME/.nvm"
 
   if [ -d $nvm_dir ]; then
@@ -7,3 +7,4 @@ function {
     export NVM_DIR=$nvm_dir
   fi
 }
+unset -f anon

.rc.d/qb64.sh

@@ -1,10 +1,11 @@
 # TODO: make this detect the latest version at least.
 # TODO: make a formula or cask for this so it can come from homebrew instead.
 
-function {
+function anon() {
    bin_path="$HOME/Applications/qb64_2022-09-08-23-37-44-47f5044_osx"
 
    if [ -d $bin_path ]; then
-      $path=($bin_path $path)
+      path=($bin_path $path)
    fi
 }
+unset -f anon

.rc.d/yarn.sh

@@ -1,6 +1,7 @@
-function {
+function anon() {
     if [[ $(command -v yarn) ]]; then
         local yarn_path="$(yarn global bin)"
         path=($yarn_path $path)
     fi
 }
+unset -f anon

.rc.d/zoxide.sh

@@ -1,7 +1,7 @@
 # TODO: Check if zoxide_path exists.
 # TODO: Check shell better.
 # -n $zoxide_path -a -n $zoxide_path
-function {
+function anon() {
   zoxide_path=$(which zoxide)
   if [ -n $zoxide_path -a $zoxide_path != "zoxide not found" ]; then
     if [ "$SHELL" = "/bin/zsh" ]; then 
@@ -9,3 +9,4 @@ function {
     fi
   fi
 }
+unset -f anon

.zprofile

@@ -13,3 +13,22 @@
 # /etc/zlogin
 # ~/.zlogin
 ##fi
+
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/bin" ] ; then
+    PATH="$HOME/bin:$PATH"
+fi
+
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/.local/bin" ] ; then
+    PATH="$HOME/.local/bin:$PATH"
+fi
+
+## ZSH version of this
+# # if running bash
+# if [ -n "$BASH_VERSION" ]; then
+#    # include .bashrc if it exists
+#    if [ -f "$HOME/.bashrc" ]; then
+# 	. "$HOME/.bashrc"
+#    fi
+# fi

.zshrc

@@ -21,16 +21,6 @@ for f in ~/.rc.d/*.sh; do
    source "$f"
 done
 
-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/bin" ] ; then
-    PATH="$HOME/bin:$PATH"
-fi
-
-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/.local/bin" ] ; then
-    PATH="$HOME/.local/bin:$PATH"
-fi
-
 # Activate ZSH autocompletion.
 autoload -Uz compinit
 compinit

README.md

@@ -7,3 +7,10 @@ Refresh history after modifying
 ```shell
 cat history/all.md| LC_ALL=C sort -u -o history/all.md
 ```
+
+## TODO
+
+* Look into lesspipe from .bashrc and make a script in .rc.d
+* Move debian_chroot, color_prompt, and PS1 from .bashrc to .rc.d
+* Move dircolors stuff from .bashrc to .rc.d
+* Move content from ~/.bash_aliases to .rc.d

install.sh

@@ -1,2 +1,7 @@
 #! /usr/bin/env sh
-cp -r .{h,r,z}* ../
+cp .gitconfig .gitignore .gitignore_global ../
+cp .hgignore_global ../
+cp .profile ../
+cp .bash_logout .bashrc ../
+cp -r .zsh_functions .zprofile .zshenv .zshrc ../
+cp -r .rc.d ../