Simplify verbiage and shorten the length.

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,16 +123,26 @@ function commit {
 
 # Easily test this project after committing changes.
 # Otherwise can just source this file unless testing setup.sh.
+project="$HOME/.git-env-termux"
 function test-termux {
-	sh -c "rm -rf ~/termux-deleteme ~/TRASH/termux-deleteme" 2>/dev/null
+	if [[ -d "$project" ]]; then
+  		log "`date` - Updating '$project'.\n"
+		git -C "$project" switch "$branch"
+		git -C "$project" pull --recurse-submodules || \
+				( echo "Failed to pull project, exiting." && return 1 )
+	else
+  		log "`date` - Downloading '$project'.\n"
 		git clone https://git.hyperling.com/me/env-termux \
-		--branch=dev ~/termux-deleteme
-	chmod 755 ~/termux-deleteme/*.sh
-	~/termux-deleteme/setup.sh "$@"
+			--branch=$BRANCH "$project"
+	fi
+	chmod 755 "$project"/*.sh
+	"$project"/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.
@@ -233,17 +237,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 +258,32 @@ function init-video-contents {
 		cd "$1"
 	fi
 	touch README.md
-	#touch title.md
-	#touch desc.md
-	#touch tags.md
+	if [[ ! -s README.md ]]; then
+		cat >> README.md <<- EOF
+			# 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 +354,22 @@ 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" ]]; then
+	git -C "$project" fetch >/dev/null 2>&1 && git -C "$project" status | grep "is behind" \
+	| while read status; do
+		log "\n\n`date` - env-termux has has been improved."
+		log "   '$status'"
+		log "\n\n`date` - Run 'reload-termux' to update."
+	done
+fi & )
+
 # 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

@@ -56,17 +56,16 @@ 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 +76,33 @@ echo -e "\n`date` - Directories"
 if [[ -d ~/TRASH ]]; then
 	rm -rfv ~/TRASH
 fi
-if [[ ! -e ~/storage/shared/TRASH ]]; then
-	mkdir -pv ~/storage/shared/TRASH
+if [[ ! -e ~/sdcard/TRASH ]]; then
+	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
 
 
-echo -e "\n`date` - env-shared"
-
-env_shared_dir="env-shared-dev-deleteme"
-git clone https://git.hyperling.com/me/env-shared \
-	--branch=dev ~/$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
+env_shared_dir="$HOME/.env-shared"
+if [[ ! -d "$env_shared_dir" ]]; then
+	echo -e "\n`date` - env-shared"
+	if [[ -z "$BRANCH" ]]; then
+		export BRANCH="dev"
+	fi
+	git clone https://git.hyperling.com/me/env-shared \
+		--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/
 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"