Move trash related code to shared env.

rc_shared.sh

@@ -37,6 +37,17 @@ 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"
+
 # Networking #
 
 alias scan="nmap -A -p- --script=vuln "
@@ -46,13 +57,21 @@ alias scan="nmap -A -p- --script=vuln "
 
 # Related specifically to this project. #
 
-function update-shared {
+branch="$BRANCH"
-   log "`date` - Reloading the '~/.rc_shared' file from env-shared.\n"
+if [[ -z "$branch" ]]; then
-   branch="$1"
+	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"
+
+	if [[ -n "$1" ]]; then
+		branch="$1"
+	fi
+
    dir="shared-rc-deleteme"
 
    git clone https://git.hyperling.com/me/env-shared \
@@ -68,8 +87,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 -Rv "$local_bin"
 	else
 		echo "Did not find '$local_bin', did not copy scripts."
 	fi
@@ -77,8 +98,45 @@ 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!"
 }
+
+project="$HOME/.env-shared"
+function update-shared2 {
+	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-shared \
+				"$project" --branch=$branch
+	fi
+
+	local_bin="$HOME/bin"
+	remote_bin="$project/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 -Rv "$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"
@@ -173,13 +231,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
 }
 
@@ -325,9 +391,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"
@@ -441,9 +509,45 @@ alias vta="v2a"
 alias pull-audio="v2a"
 alias pa="v2a"
 
+
+## Trash Related ##
+
+TRASH_ROOT="/"
+if [[ -d "/sdcard" ]]; then
+	# Android / Termux
+	TRASH_ROOT="/sdcard"
+else
+	# Desktop
+	TRASH_ROOT="$HOME"
+fi
+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; 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'
+
+
+## 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` - Updates to env-shared are available via 'update-shared2'."
+		log "   '$status'"
+	done
+fi & )
+
 
 ## Complete! ##