Fix indent of function.

bashrc.sh

@@ -1,11 +1,32 @@
 # 2024-02-10 Hyperling
 
+## Environment Setup ##
+
 export PATH="~/bin:$PATH"
 
 if [[ -e ~/.env ]]; then
 	source ~/.env
 fi
 
+if [ -f ~/.rc_shared ]; then
+	source ~/.rc_shared
+fi
+
+# PS1
+# This helps to determine the color palette numbers:
+#  https://robotmoon.com/bash-prompt-generator/
+# Colors are in env-shared.
+if [[ "`whoami`" == "root" ]]; then
+	export PS1='\[$BOLD\]\[$ORANGE\][\[$SCARLET\]\t \[$RED\]\w\[$ORANGE\]]\[$GRAY\]\$ \[$RESET\]'
+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.
@@ -16,19 +37,6 @@ else
 	alias prod="echo 'ERROR: .env not set up properly, please fix and reload RC.'"
 fi
 
-# Quickies
-alias reload-bash="source ~/.bashrc"
-alias bash-reload="reload-bash"
-alias shell-reload="reload-bash"
-alias reload-shell="reload-bash"
-alias reload="reload-bash"
-
-alias l='ls '
-alias ll='ls -alh '
-alias lh='ls -ash '
-
-alias clone="rsync -auPhz --delete --exclude '.gradle' --exclude 'app/build' "
-
 # Easily get to storage devices.
 curr="`pwd`"
 cd
@@ -50,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 "
@@ -71,7 +68,6 @@ function bye { exit; }
 alias install="pkg install "
 alias uninstall="pkg uninstall "
 alias remove="uninstall "
-alias scan="nmap -A -p- --script=vuln "
 
 
 ### Functions ###
@@ -127,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 reload-termux="test-termux "
-alias termux-test="test-termux"
+alias termux-test="test-termux "
-alias termux-reload="reload-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"
@@ -227,241 +232,21 @@ alias upgrade="update"
 alias goodbye="update -y && bye"
 
 
-## Videk Related ##
+## Video Related ##
-
-# Optimize the bitrate and audio levels for an edited video.
-function process-video-usage {
-	echo "USAGE: process-video oldFile newFile [videoBitrate] [audioBitrate] [sizeRating] [numPasses] [forceBitrate]"
-	echo -n "Purpose: Call ffmpeg with preferred video posting settings. "
-	echo -n "Bitrates default to 2000k and 192k, size is 720, passes is 1, and force is N."
-	echo "These work well on Odysee and are fairly small as backups."
-	echo "Examples:"
-	echo "- Create a small file for quick streaming."
-	echo "    process-video youcut.mp4 20240210.mp4 1200k 128k 480"
-	echo "- Create a larger file for something like YouTube."
-	echo "    process-video youcut.mp4 20240210_1080p.mp4 5000k 256k 1080"
-}
-function process-video {
-	# Parameters
-	file="$1"
-	newfile="$2"
-	video="$3"
-	audio="$4"
-	size="$5"
-	passes="$6"
-	force="$7"
-
-	# Validations
-	if [[ -z $file || ! -e $file ]]; then
-		echo "ERROR: Original file '$file' does not exist." >&2
-		process-video-usage
-		return 1
-	fi
-
-	if [[ -z $newfile ]]; then
-		echo "ERROR: New file's name must be provided." >&2
-		process-video-usage
-		return 1
-	elif [[ -e $newfile ]]; then
-		echo "ERROR: New file '$newfile' already exists." >&2
-		du -h "$newfile"
-		process-video-usage
-		return 1
-	fi
-
-	echo "`date` - Converting '$file' to '$newfile'."
-
-	if [[ -z $video ]]; then
-		video="2000k"
-	fi
-	if [[ $force == "Y" ]]; then
-		video="-b:v $video"
-	else
-		video="-b:v $video -minrate 0 -maxrate $video -bufsize $video"
-	fi
-
-	if [[ -z $audio ]]; then
-		audio="192k"
-	fi
-	audio="-b:a $audio"
-
-	if [[ -z $size ]]; then
-		size="720"
-	fi
-	size="-filter:v scale=-1:$size"
-
-	if [[ -z $passes ]]; then
-		passes=1
-	fi
-	pass=""
-	if [[ $passes != 1 ]]; then
-		passes=2
-		pass="-pass 2"
-	fi
-
-	## Main ##
-	# More information on two-pass processing with ffmpeg
-	# https://cinelerra-gg.org/download/CinelerraGG_Manual/Two_pass_Encoding_with_FFmp.html
-	if [[ $passes == 2 ]]; then
-		set -x
-		ffmpeg -nostdin -hide_banner -loglevel quiet \
-			-i "$file" $size $video $audio \
-			-filter:a "dynaudnorm=f=33:g=65:p=0.66:m=33.3" \
-			-vcodec libx264 -movflags +faststart \
-			-pass 1 -f mp4 /dev/null -y
-		status=$?
-		set +x
-		echo "`date` - Done with the first pass."
-		if [[ $status != 0 ]]; then
-			echo "Received unsuccessful status, exiting."
-			return 1
-		fi
-	fi
-
-	set -x &&
-	ffmpeg -nostdin -hide_banner -loglevel quiet \
-		-i "$file" $size $video $audio \
-		-filter:a "dynaudnorm=f=33:g=65:p=0.66:m=33.3" \
-		-vcodec libx264 -movflags +faststart \
-		$pass "$newfile"
-	status="$?"
-	set +x
-	echo "`date` - Done with the final pass."
-
-	if [[ $passes == 2 && $status == 0 ]]; then
-		mv -v ffmpeg2pass*.log* ~/TRASH/
-	fi
-
-	sync
-	sleep 10
-	sync
-	if [[ -s $newfile ]]; then
-		echo "`date` - Getting file sizes."
-		du -h "$file"
-		du -h "$newfile"
-	else
-		echo "ERROR: New file not created or has a 0 size." >&2
-	fi
-
-	echo -e "\n`date` - Finished with status '$status'."
-	return $status
-}
-alias pv="process-video"
-alias qpv="pv ./raw/YouCut*.mp4 `basename $(pwd)`.mp4"
-
-# Allow converting video to audio ad other smaller
-# tasks than what process-video is intended to do.
-function basic-process-usage {
-	echo "basic-process INPUT OUTPUT NORMALIZE [EXTRA]"
-	echo -n "Pass a file through ffmpeg with the option"
-	echo "to easily normalize the audio with a Y."
-	echo "Examples:"
-	echo "- Normalize audio on a video."
-	echo "    basic-process video.mp4 normalized.mp4 Y"
-	echo "- Convert a video to audio at 192k."
-	echo "    basic-process video.mp4 audio.mp3 N '-b:a 192k'"
-}
-function basic-process {
-	# Parameters
-	input="$1"
-	output="$2"
-	typeset -u normalize
-	normalize="$3"
-	extra="$4"
-
-	echo "`date` - Starting basic-process"
-
-	# Validations
-	if [[ -z $input || ! -e $input ]]; then
-		echo "ERROR: Input file '$input' does not exist." >&2
-		basic-process-usage
-		return 1
-	fi
-
-	if [[ -z $output ]]; then
-		echo "ERROR: Output file's name must be provided." >&2
-		basic-process-usage
-		return 1
-	elif [[ -e $output ]]; then
-		echo "ERROR: Output file '$output' already exists." >&2
-		du -h "$output"
-		basic-process-usage
-		return 1
-	fi
-
-	if [[ $normalize == "Y" ]]; then
-		echo "Normalize set to TRUE."
-		normal="-filter:a dynaudnorm=f=33:g=65:p=0.66:m=33.3"
-	else
-		echo "No audio normalization is being done."
-	fi
-
-	# Main
-	echo "`date` - Converting '$input' to '$output'."
-	set -x
-	ffmpeg -nostdin -hide_banner -loglevel quiet \
-		-i "$input" $extra $normal "$output"
-	status=$?
-	set +x
-
-	if [[ $status != 0 ]]; then
-		echo "`date` - WARNING: ffmpeg exited with status '$status'." >&2
-	fi
-
-	# Finish
-	if [[ ! -s $output ]]; then
-		echo "`date` - ERROR: Output '$output' not created or has 0 size." >&2
-		return 1
-	fi
-
-	sync
-	echo "`date` - '$output' has been created successfully."
-	sleep 3
-	du -h "$input"
-	du -h "$output"
-
-	echo "`date` - Finished basic-process"
-	return 0
-}
-alias bp="basic-process"
-alias bv="bp"
-
-# Function to automatically append tbe Y.
-function fix-audio {
-	basic-process "$1" Y
-}
-
-# Function to easily turn a video to audio without typing the audio name.
-function convert-to-audio {
-	video="$1"
-	audio="$2"
-	if [[ -z "$2" || "$2" == "Y" ]]; then
-		audio="${1//mp4/mp3}"
-	fi
-	volume=""
-	if [[ ( "$2" == "Y" && -z "$3" ) || "$3" == "Y" ]]; then
-		$volume="Y"
-	fi
-	basic-process "$video" "$audio" $volume
-}
-alias v2a="convert-to-audio"
-alias vta="v2a"
-alias va="v2a"
-alias pa="v2a"
 
 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"
 
@@ -472,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"
@@ -491,12 +299,6 @@ alias qv="qvd"
 
 ## Backup Related ##
 
-function now {
-	date "+%Y%m%d-%H%M%S"
-}
-function today {
-	date "+%Y%m%d"
-}
 export BACKUP_DIR="/srv/backup"
 export DOCKER="Docker"
 export SYSTEM="System"
@@ -551,10 +353,43 @@ alias prod-backup="pull_prod_backups"
 alias pull-prod="pull_prod_backups"
 alias prod-pull="pull_prod_backups"
 
-if [ -f ~/.rc_shared ]; then
+
-	. ~/.rc_shared
+## Finalize ##
-fi
+
+# 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 "'$PROG' completed!"
+echo "`date` - '$PROG' completed!"

example.env

@@ -1,17 +1,18 @@
 # Variables for fast-access of production server.
 
-PROD_HOST=example.com
+export PROD_HOST=example.com
-PROD_PORT=2222
+export PROD_PORT=2222
-PROD_USER=user
+export PROD_USER=user
 
-PROD_GIT_HOST=git.example.com
+export PROD_GIT_HOST=git.example.com
-PROD_GIT_PORT=8080
+export PROD_GIT_PORT=8080
-PROD_GIT_USER=git
+export PROD_GIT_USER=git
+export PROD_GIT_BRANCH=main
 
-PROD_DATA_HOST=sftp.example.com
+export PROD_DATA_HOST=sftp.example.com
-PROD_DATA_PORT=2200
+export PROD_DATA_PORT=2200
-PROD_DATA_USER=data
+export PROD_DATA_USER=data
-PROD_DATA_DIR=/srv/sftp
+export PROD_DATA_DIR=/srv/sftp
 
 PROG="$(basename -- "${BASH_SOURCE[0]}")"
-echo "'$PROG' completed!"
+echo "`date` - '$PROG' completed!"

setup.sh

@@ -10,8 +10,13 @@ DIR="`pwd`"
 echo "Working in '$DIR'."
 
 
-if [[ $1 == "skip" ]]; then
+skip="false"
-	echo "\n`date` - Skipping Updates"
+if [[ "$@" == *"skip"* || "$@" == *"-s"* ]]; then
+	skip="true"
+fi
+
+if [[ "$skip" == "true" ]]; then
+	echo -e "\n`date` - Skipping Updates"
 else
 	echo -e "\n`date` - Upgrade Package Repos"
 	pkg update &&
@@ -35,33 +40,28 @@ else
 fi
 
 
-if [[ $1 == "skip" ]]; 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 \
+	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
@@ -72,27 +72,45 @@ 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"
-if [[ ! -d ~/bin ]]; then
+	fi
-	mkdir -pv ~/bin
+	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/
+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/
 
 
 echo -e "\n`date` - Cleanup"
@@ -100,8 +118,9 @@ echo -e "\n`date` - Cleanup"
 if [[ -n $DIR && $DIR != "/" && $DIR == *"deleteme" && -d .git ]]; then
 	echo "We are in a git clone, remove the project."
 	cd ..
-	mv -v $DIR ~/TRASH/termux-"`date +'%Y%m%d%H%M%S'`" |
+	mv -v $DIR \
-		grep -v '/.git/'
+	 ~/TRASH/termux-"`date +'%Y%m%d%H%M%S'`" \
+  	| grep -v '/.git/'
 else
 	echo "File was used individually, remove it."
 	mv "$PROG" ~/TRASH/