Fix indent of function.

bashrc.sh

@@ -22,6 +22,11 @@ else
 	export PS1='\[$BOLD\]\[$GRAY\][\[$ORANGE\]\t \[$GREEN\]\w\[$GRAY\]]\[$RESET\]\$ '
 fi
 
+if [[ -z "$BRANCH" ]]; then
+	export BRANCH="dev"
+fi
+
+
 ## Aliases ##
 
 # Quickly log onto production server.
@@ -53,17 +58,6 @@ alias dcim="cd $DCIM"
 export CODE="$SS/Code"
 alias code="cd $CODE"
 
-# Shortcuts for TRASH.
-export TRASH="$SS/TRASH"
-alias trash="cd $TRASH"
-alias clean-trash="bash -c 'rm -rfv $TRASH/*'; clean-trashed"
-alias trash-clean="clean-trash"
-alias check-trash="du -h $TRASH"
-alias trash-check="check-trash"
-
-alias clean-trashed='find "$SS" -name ".trashed*" -exec du -h {} \; -delete | sort -h'
-alias check-trashed='find "$SS" -name ".trashed*" -exec du -h {} \; -exec mv -v {} ~/TRASH/ \; | sort -h'
-
 # Help prevent mistakes.
 alias cp="cp -v "
 alias mv="mv -v "
@@ -129,71 +123,80 @@ function commit {
 
 # Easily test this project after committing changes.
 # Otherwise can just source this file unless testing setup.sh.
+export PROJECT_TERMUX="$HOME/.git-env-termux"
 function test-termux {
-	sh -c "rm -rf ~/termux-deleteme ~/TRASH/termux-deleteme" 2>/dev/null
+	if [[ -d "$PROJECT_TERMUX" ]]; then
-	git clone https://git.hyperling.com/me/env-termux \
+  		log "`date` - Updating '$PROJECT_TERMUX'.\n"
-		--branch=dev ~/termux-deleteme
+		git -C "$PROJECT_TERMUX" switch "$BRANCH"
-	chmod 755 ~/termux-deleteme/*.sh
+		git -C "$PROJECT_TERMUX" pull --recurse-submodules || \
-	~/termux-deleteme/setup.sh "$@"
+				( echo "Failed to pull project, exiting." && return 1 )
+	else
+  		log "`date` - Downloading '$PROJECT_TERMUX'.\n"
+		git clone https://git.hyperling.com/me/env-termux \
+			--branch=$BRANCH "$PROJECT_TERMUX"
+	fi
+	"$PROJECT_TERMUX"/setup.sh "$@"
 }
 alias reload-termux="test-termux "
 alias termux-test="test-termux "
 alias termux-reload="reload-termux "
+alias termux-update="reload-termux "
+alias update-termux="reload-termux "
 
 
 # Pulled from /me/env-ansible, need to make a shared library between it and Termux.
 # Change a branch to point at another.
 function load-branch {
-rcvr="$1" # branch which we want to modify
+	rcvr="$1" # branch which we want to modify
-base="$2" # branch with the changes we want
+	base="$2" # branch with the changes we want
 
-if [[ "$rcvr" == "main" ]]; then
+	if [[ "$rcvr" == "main" ]]; then
-	echo "*** ERROR: Are you nuts, fool!? Not main! Do it manually! ***"
+		echo "*** ERROR: Are you nuts, fool!? Not main! Do it manually! ***"
-	return 1
-fi
-
-if [[ -z "$base" ]]; then
-	if [[ "$rcvr" == "prod" ]]; then
-		base="stage"
-	elif [[ "$rcvr" == "stage" ]]; then
-		base="dev"
-	else
-		echo "* Unsure which branch to use for '$rcvr'. Please specify."
 		return 1
 	fi
-	echo "* Base was not specified, using '$base' for '$rcvr'."
-else
-	echo "* Requested pointing '$rcvr' branch to '$base'."
-fi
 
-echo -e "\n* Ensuring we are on base branch '$base'." &&
+	if [[ -z "$base" ]]; then
-git switch "$base" &&
+		if [[ "$rcvr" == "prod" ]]; then
-echo -e "\n* Changing pointer for '$rcvr' to '$base'." &&
+			base="stage"
-git branch -f "$rcvr" "$base" &&
+		elif [[ "$rcvr" == "stage" ]]; then
-#echo -e "\n* Switching to branch '$rcvr'." &&
+			base="dev"
-#git switch "$rcvr" &&
+		else
-echo -e "\n* Forcing push on branch '$rcvr'." &&
+			echo "* Unsure which branch to use for '$rcvr'. Please specify."
-git push --force --set-upstream origin "$rcvr" &&
+			return 1
-echo -e "\n* Done! Displaying list of remote branches." &&
+		fi
-git ls-remote --heads | sort
+		echo "* Base was not specified, using '$base' for '$rcvr'."
-
-if [[ "$base" != "dev" ]]; then
-	echo -e "\n* Checking if a dev branch exists."
-	git ls-remote --exit-code --heads origin dev
-	dev_exists="$?"
-	if [[ "$dev_exists" == 0 ]]; then
-		echo -e "\n* Switching back to dev."
-		git switch dev
-	elif [[ "$dev_exists" == 2 ]]; then
-		echo -e "\n* Switching back to main."
-		git switch main
 	else
-		echo "*** ERROR: Unknown status for dev_exists, '$dev_exists'. ***"
+		echo "* Requested pointing '$rcvr' branch to '$base'."
 	fi
-fi
 
-echo -e "\n* Verifying which branch we're on."
+	echo -e "\n* Ensuring we are on base branch '$base'." &&
-git branch
+	git switch "$base" &&
+	echo -e "\n* Changing pointer for '$rcvr' to '$base'." &&
+	git branch -f "$rcvr" "$base" &&
+	#echo -e "\n* Switching to branch '$rcvr'." &&
+	#git switch "$rcvr" &&
+	echo -e "\n* Forcing push on branch '$rcvr'." &&
+	git push --force --set-upstream origin "$rcvr" &&
+	echo -e "\n* Done! Displaying list of remote branches." &&
+	git ls-remote --heads | sort
+
+	if [[ "$base" != "dev" ]]; then
+		echo -e "\n* Checking if a dev branch exists."
+		git ls-remote --exit-code --heads origin dev
+		dev_exists="$?"
+		if [[ "$dev_exists" == 0 ]]; then
+			echo -e "\n* Switching back to dev."
+			git switch dev
+		elif [[ "$dev_exists" == 2 ]]; then
+			echo -e "\n* Switching back to main."
+			git switch main
+		else
+			echo "*** ERROR: Unknown status for dev_exists, '$dev_exists'. ***"
+		fi
+	fi
+
+	echo -e "\n* Verifying which branch we're on."
+	git branch
 }
 alias load-prod="load-branch prod"
 alias load-stage="load-branch stage"
@@ -233,17 +236,17 @@ alias goodbye="update -y && bye"
 
 alias pull-content="mv -v $SS/DCIM/Camera/`date +"%Y-%m-%d"`* ./raw/"
 
-alias pull-screenshots="mv -v $SS/Pictures/Screenshots/* ./raw/"
+alias pull-screenshots="mv -v $SS/Pictures/Screenshots/*`date +"%Y%m%d"`* ./raw/"
 alias pull-screenshot="pull-screenshots"
 alias pull-sc="pull-screenshots"
 
 alias pull-crops="mv -v $SS/Documents/*/`date +"%Y%m%d"`*.{jpg,png} ./raw/"
 
-alias pull-youcuts="mv -v $SS/Movies/youcut/* ./raw/"
+alias pull-youcuts="mv -v $SS/Movies/youcut/*`date +"%Y%m%d"`* ./raw/"
 alias pull-youcut="pull-youcuts"
 alias pull-yc="pull-youcut"
 
-alias pull-memes="mv -v $SS/Pictures/memetastic/memes/*.jpg ./"
+alias pull-memes="mv -v $SS/Pictures/memetastic/memes/*`date +"%Y-%m-%d"`*.jpg ./"
 alias pull-meme="pull-memes"
 alias pull-icon="pull-meme"
 
@@ -254,9 +257,32 @@ function init-video-contents {
 		cd "$1"
 	fi
 	touch README.md
-	#touch title.md
+	if [[ ! -s README.md ]]; then
-	#touch desc.md
+		cat >> README.md <<- EOF
-	#touch tags.md
+			# title
+
+			COOL SIMPLE TITLE
+
+			# desc
+
+			VIDEO DESCRIPTION GOES HERE! :)
+
+			---
+
+			Recorded and edited on YYYY-MM-DD.
+
+			[blog.hyperling.com/TBD](https://blog.hyperling.com/TBD)
+
+			# tags
+
+			- TAG1
+			, TAG2
+			, TAG3
+			, TAG4
+			, TAG5
+
+		EOF
+	fi
 	mkdir -pv raw
 }
 alias init-video="init-video-contents"
@@ -327,6 +353,43 @@ alias prod-backup="pull_prod_backups"
 alias pull-prod="pull_prod_backups"
 alias prod-pull="pull_prod_backups"
 
+
+## Finalize ##
+
+# Export all functions! #
+eval "$(declare -F | grep -v _ | sed 's/-f /-fx /')"
+
+# Run update checker in background.
+(
+	(
+		if [[ -d "$PROJECT_TERMUX" ]]; then
+			git -C "$PROJECT_TERMUX" fetch >/dev/null 2>&1 \
+				&& git -C "$PROJECT_TERMUX" status \
+				| grep "is behind" \
+			| while read status; do
+				title=TBD
+				message=TBD
+				success=0
+				reload-termux || success=1
+				if [[ "$success" == 0 ]]; then
+					title="env-termux Updated"
+					message="Reloaded automatically, please reload BASH. :)"
+				else
+					title="env-termux Updates Available"
+					message="Update with 'reload-termux'."
+				fi
+				if [[ -d /sdcard ]]; then
+					termux-notification \
+						-t "$title" \
+						-c "$message"
+				else
+					notify-send "$title" "$message"
+				fi
+			done
+		fi
+	) >> "$HOME"/Reports/env-termux.log.txt 2>&1 &
+)
+
 # Complete!
 PROG="$(basename -- "${BASH_SOURCE[0]}")"
 echo "`date` - '$PROG' completed!"

example.env

@@ -7,6 +7,7 @@ export PROD_USER=user
 export PROD_GIT_HOST=git.example.com
 export PROD_GIT_PORT=8080
 export PROD_GIT_USER=git
+export PROD_GIT_BRANCH=main
 
 export PROD_DATA_HOST=sftp.example.com
 export PROD_DATA_PORT=2200
@@ -14,4 +15,4 @@ export PROD_DATA_USER=data
 export PROD_DATA_DIR=/srv/sftp
 
 PROG="$(basename -- "${BASH_SOURCE[0]}")"
-echo "'`date` - $PROG' completed!"
+echo "`date` - '$PROG' completed!"

setup.sh

@@ -11,12 +11,12 @@ echo "Working in '$DIR'."
 
 
 skip="false"
-if [[ "$1" == "skip" || "$2" == "skip" || "$3" == "skip" ]]; then
+if [[ "$@" == *"skip"* || "$@" == *"-s"* ]]; then
 	skip="true"
 fi
 
 if [[ "$skip" == "true" ]]; then
-	echo "\n`date` - Skipping Updates"
+	echo -e "\n`date` - Skipping Updates"
 else
 	echo -e "\n`date` - Upgrade Package Repos"
 	pkg update &&
@@ -40,33 +40,28 @@ else
 fi
 
 
-if [[ "$skip" == "true" ]]; then
+echo -e "\n`date` - Install & Updayte Crtical Software"
-	echo "\n`date` - Skipping Installs"
+pkg install -y \
-else
+	openssh tsu vim htop git cronie man zip ncurses-utils \
-	echo -e "\n`date` - Install Software"
+	nmap traceroute wget rsync \
-	pkg install -y \
+	ffmpeg imagemagick \
-		openssh tsu vim htop git cronie man zip ncurses-utils \
+	kotlin php nodejs python libllvm hugo
-		nmap traceroute wget rsync \
-		ffmpeg imagemagick \
-		kotlin php nodejs python libllvm hugo
-fi
 
 
 echo -e "\n`date` - BASH Environment"
 
 if [[ ! -e ~/.env ]]; then
 	if [[ -e example.env ]]; then
-		mv -v example.env ~/.env
+		cp -v example.env ~/.env
 	else
 	echo "ERROR: Neither .env or example.env found." >&2
 	fi
 else
 	echo "'.env' already exists. Good job!"
-	rm -v example.env
 fi
 
 if [[ -e bashrc.sh ]]; then
-	mv -v bashrc.sh ~/.bashrc
+	cp -v bashrc.sh ~/.bashrc
 else
 	echo "ERROR: bashrc.sh not found, skipping." >&2
 fi
@@ -77,31 +72,46 @@ echo -e "\n`date` - Directories"
 if [[ -d ~/TRASH ]]; then
 	rm -rfv ~/TRASH
 fi
-if [[ ! -e ~/storage/shared/TRASH ]]; then
+if [[ ! -e ~/sdcard/TRASH ]]; then
-	mkdir -pv ~/storage/shared/TRASH
+	mkdir -pv /sdcard/TRASH
 fi
-ln -s ~/storage/shared/TRASH ~/TRASH
+ln -s /sdcard/TRASH ~/TRASH
 
-if [[ ! -d ~/Code && ! -d ~/storage/shared/Code ]]; then
+if [[ ! -d ~/Code && ! -d ~/sdcard/Code ]]; then
 	mkdir -pv ~/Code
-	ln -s ~/Code ~/storage/shared/Code
+	ln -s ~/Code /sdcard/Code
+fi
+
+if [[ -d /sdcard && ! -d "$HOME"/Reports ]]; then
+	mkdir -pv /sdcard/Reports
+	ln -s /sdcard/Reports "$HOME"/Reports
 fi
 
 
 echo -e "\n`date` - env-shared"
-
+env_shared_dir="$HOME/.git-env-shared"
-env_shared_dir="env-shared-dev-deleteme"
+if [[ ! -d "$env_shared_dir" ]]; then
-git clone https://git.hyperling.com/me/env-shared \
+	echo -e "`date` - Not installed, downloading."
-	--branch=dev ~/$env_shared_dir
+	if [[ -z "$BRANCH" ]]; then
-cp -v ~/$env_shared_dir/rc_shared.sh ~/.rc_shared
+		export BRANCH="dev"
-cp -v ~/$env_shared_dir/vimrc.vim ~/.vimrc
+	fi
-if [[ ! -d ~/bin ]]; then
+	git clone https://git.hyperling.com/me/env-shared \
-	mkdir -pv ~/bin
+		--branch=$BRANCH "$env_shared_dir"
+	cp -v "$env_shared_dir"/rc_shared.sh ~/.rc_shared
+	cp -v "$env_shared_dir"/vimrc.vim ~/.vimrc
+	if [[ ! -d ~/bin ]]; then
+		mkdir -pv ~/bin
+	fi
+	cp -v "$env_shared_dir"/bin-shared/* ~/bin/
+else
+	echo -e "`date` - Already installed, updating."
+	git -C "$env_shared_dir" switch "$BRANCH"
+	git -C "$env_shared_dir" pull --recurse-submodules || \
+			( echo "Failed to pull project, exiting." && return 1 )
+   cp -v "$env_shared_dir"/rc_shared.sh ~/.rc_shared
+	cp -v "$env_shared_dir"/vimrc.vim ~/.vimrc
 fi
-cp -v ~/$env_shared_dir/bin-shared/* ~/bin/
+
-mv -v ~/$env_shared_dir \
-   ~/TRASH/$env_shared_dir-"`date "+%Y%m%d-%H%M%S"`" \
-    |	grep -v '/.git/'
 
 echo -e "\n`date` - Cleanup"