Add export to other variable(s). Fix some spacing.

rc_shared.sh

@@ -37,21 +37,66 @@ alias l='ls '
 alias ll='ls -alh '
 alias lh='ls -ash '
 
+function cl {
+	if [[ -d /sdcard ]]; then
+		cd /sdcard/Library/Clones
+	else
+		cd $HOME/Clones
+	fi
+}
+alias clones="cl"
+alias cdl="cl"
+alias cdc="cl"
+
+alias library="clones && cd .."
+alias lib="library"
+
 # Networking #
 
 alias scan="nmap -A -p- --script=vuln "
 
+# Trash Related #
+
+export TRASH_ROOT="/"
+if [[ -d "/sdcard" ]]; then
+	# Android / Termux
+	export TRASH_ROOT="/sdcard"
+else
+	# Desktop
+	export TRASH_ROOT="$HOME"
+fi
+export TRASH="$TRASH_ROOT/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 | sort -h; find "$TRASH_ROOT" -name .Trash"*" -exec du -h {} \; -exec mv -v {} "$TRASH"/ \;'
+alias trash-check="check-trash"
+
+alias check-trashed='find "$TRASH_ROOT" -name ".trashed*" -exec du -h {} \; -exec mv -v {} "$TRASH"/ \; | sort -h'
+alias clean-trashed='find "$TRASH_ROOT" -name ".trashed*" -exec du -h {} \; -delete | sort -h'
+
 
 ## Functions ##
 
 # Related specifically to this project. #
 
-function update-shared {
+branch="$BRANCH"
+if [[ -z "$branch" ]]; then
+	branch="$PROD_GIT_BRANCH"
+fi
+if [[ -z "$branch" ]]; then
+	branch="dev"
+fi
+
+function update-shared-old {
    log "`date` - Reloading the '~/.rc_shared' file from env-shared.\n"
-   branch="$1"
-   if [[ -z "$branch" ]]; then
-      branch="dev"
-   fi
+
+	if [[ -n "$1" ]]; then
+		branch="$1"
+	fi
 
    dir="shared-rc-deleteme"
 
@@ -68,8 +113,10 @@ function update-shared {
 
 		refactor_script="refactor_music_library.sh"
 		wget -O "$refactor_script" \
-			https://git.hyperling.com/me/shell-music-refactor-library/src/branch/main/refactor_music_library.sh
+			https://git.hyperling.com/me/shell-music-refactor-library/raw/branch/main/refactor_music_library.sh
 		mv -v $refactor_script "$local_bin"/
+
+		chmod 755 -Rc "$local_bin"
 	else
 		echo "Did not find '$local_bin', did not copy scripts."
 	fi
@@ -77,12 +124,95 @@ function update-shared {
 	log "\n`date` - Done! Removing git clone.\n"
    mv -v $dir ~/TRASH/"$dir-`date "+%Y%m%d-%H%M%S"`"
 
-   log "\n`date` - Complete! Please note this does NOT update bin files."
+   log "\n`date` - Complete!"
 }
+
+export PROJECT_SHARED="$HOME/.git-env-shared"
+function update-shared2 {
+	# Refresh the local env-shared repo.
+	if [[ -d $PROJECT_SHARED ]]; then
+  		log "`date` - Updating '$PROJECT_SHARED'.\n"
+		git -C "$PROJECT_SHARED" switch "$branch"
+		git -C "$PROJECT_SHARED" pull --recurse-submodules || \
+				( echo "Failed to pull project, exiting." && return 1 )
+	else
+  		log "`date` - Downloading '$PROJECT_SHARED'.\n"
+		git clone https://git.hyperling.com/me/env-shared \
+				"$PROJECT_SHARED" --branch=$branch
+	fi
+
+	# Tha main piece! Reload the shared RC file.
+   cp -v "$PROJECT_SHARED"/rc_shared.sh ~/.rc_shared
+	cp -v "$PROJECT_SHARED"/vimrc.vim ~/.vimrc
+
+	# Copy the scripts from the shared bin to the home bin.
+	local_bin="$HOME/bin"
+	remote_bin="$PROJECT_SHARED/bin-shared"
+	if [[ -d "$local_bin" ]]; then
+		log "\n`date` - Found '$local_bin', adding scripts.\n"
+		cp -v "$remote_bin"/*.sh "$local_bin"/
+
+		refactor_script="refactor_music_library.sh"
+		wget -O "$refactor_script" \
+			https://git.hyperling.com/me/shell-music-refactor-library/raw/branch/main/refactor_music_library.sh
+		mv -v $refactor_script "$local_bin"/
+
+		chmod 755 -Rc "$local_bin"
+	else
+		echo "Did not find '$local_bin', did not copy scripts."
+	fi
+
+   log "\n`date` - Complete!"
+}
+alias shared-update2="update-shared2"
+alias reload-shared2="update-shared2"
+alias shared-reload2="update-shared2"
+
+alias update-shared="update-shared2"
 alias shared-update="update-shared"
 alias reload-shared="update-shared"
 alias shared-reload="update-shared"
 
+function reload-all {
+	log "`date` - Reloading BASH"
+	reload-bash
+
+	log "\n`date` - Reloading Main (Termux/Ansible)"
+	if [[ -d /sdcard ]]; then
+		reload-termux
+	else
+		scm.sh
+	fi
+	reload-bash
+
+	log "\n`date` - Reloading Shared"
+	reload-shared
+	reload-bash
+}
+alias all-reload="reload-all"
+
+function update-all {
+	log "`date` - Updating env projects..."
+	reload-all
+
+	log "\n\n\n`date` - Running system updates..."
+	update -y
+
+	if [[ $(type -t update-sdk 2>/dev/null 1>&2) ]]; then
+		log "\n\n\n`date` - Updating SDKs..."
+		update-sdk
+	fi
+
+	log "\n\n\n`date` - Done with update-all!"
+}
+alias all-update="update-all"
+
+PROJECT_SHARED_OLD01="$HOME/.env-shared"
+if [[ -d "$PROJECT_SHARED_OLD01" ]]; then
+	log "`date` - Removing old project name '$PROJECT_SHARED_OLD01'."
+	mv -v "$PROJECT_SHARED_OLD01" "$TRASH"/env-shared-deleteme | grep -v ".git"
+fi
+
 # Shortcuts #
 
 function send-master { send_master.sh; }
@@ -173,13 +303,21 @@ function sync-all {
 		echo "- $dir"
 	done
 
-	echo -e "`date` - \nDone."
+	echo -e "`date` - Done.\n"
 }
 function sync-all-loop {
+	typeset -i sleep_time
+	if [[ "$1" ]]; then
+		sleep_time="$1"
+	fi
+	if [[ -z "$sleep_time" || "$sleep_time" == 0 ]]; then
+		sleep_time="300"
+	fi
+	log "`date` - Sleep timer set for '$sleep_time' seconds."
 	while true; do
 		sync-all
 		echo -e "\n\n*** Sleeping... ***\n\n"
-		sleep 30
+		sleep 300
 	done
 }
 
@@ -217,7 +355,6 @@ function sync-syncs {
 	EOF
 }
 
-
 # Audio #
 
 # Video #
@@ -325,9 +462,11 @@ function process-video {
 		mv -v ffmpeg2pass*.log* ~/TRASH/
 	fi
 
+	echo "`date` - Syncing data."
 	sync
 	sleep 10
 	sync
+
 	if [[ -s $newfile ]]; then
 		echo "`date` - Getting file sizes."
 		du -h "$file"
@@ -340,7 +479,7 @@ function process-video {
 	return $status
 }
 alias pv="process-video"
-alias qpv="pv ./raw/YouCut*.mp4 `basename $(pwd)`.mp4"
+alias qpv="pv ./raw/YouCut*.mp4 $(basename `pwd`).mp4"
 
 # Allow converting video to audio and other smaller
 # tasks than what process-video is intended to do.
@@ -441,9 +580,43 @@ alias vta="v2a"
 alias pull-audio="v2a"
 alias pa="v2a"
 
+
+## Finalize ##
+
 # Export all functions! #
 eval "$(declare -F | grep -v _ | sed 's/-f /-fx /')"
 
+# Run update checker in background.
+(
+	(
+		if [[ -d "$PROJECT_SHARED" ]]; then
+			git -C "$PROJECT_SHARED" fetch >/dev/null 2>&1 \
+				&& git -C "$PROJECT_SHARED" status \
+				| grep "is behind" \
+			| while read status; do
+				title=TBD
+				message=TBD
+				success=0
+				reload-shared || success=1
+				if [[ "$success" == 0 ]]; then
+					title="env-shared Updated"
+					message="Reloaded automatically, please reload BASH. :)"
+				else
+					title="env-shared Updates Available"
+					message="Update with 'reload-shared'."
+				fi
+				if [[ -d /sdcard ]]; then
+					termux-notification \
+						-t "$title" \
+						-c "$message"
+				else
+					notify-send "$title" "$message"
+				fi
+			done
+		fi
+	) >> "$HOME"/Reports/env-shared.log.txt 2>&1 &
+)
+
 
 ## Complete! ##