From affecf0efb5ed5b110dd4450b2ad844375c2b7f4 Mon Sep 17 00:00:00 2001 From: USER Date: Tue, 13 Feb 2024 19:32:30 +0000 Subject: [PATCH] updates --- Makefile.gitshared | 19 ------------------- sbin/setupFirstUseGit | 2 +- shared/bashrc | 3 ++- SynoConfig.sh => syno/SynoConfig.sh | 0 4 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 Makefile.gitshared rename SynoConfig.sh => syno/SynoConfig.sh (100%) diff --git a/Makefile.gitshared b/Makefile.gitshared deleted file mode 100644 index 8c563ca..0000000 --- a/Makefile.gitshared +++ /dev/null @@ -1,19 +0,0 @@ -SHELL := /bin/sh -ZZ = /zz -MAKEFILE := $(firstword $(MAKEFILE_LIST)) -MAKEFILE_NAME := $$(basename ${MAKEFILE}) - -.PHONY: help -help: ## Show this help - @egrep -h '\s##\s' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' - -##### -mark-complete: - -touch /var/tmp/${MAKEFILE_NAME} - -update: - -(${ZZ}/zShared/sbin/GitClone) - -(${ZZ}/zShared/sbin/GitPull) - -##### -load-all: update mark-complete diff --git a/sbin/setupFirstUseGit b/sbin/setupFirstUseGit index 165bb0e..154c958 100755 --- a/sbin/setupFirstUseGit +++ b/sbin/setupFirstUseGit @@ -74,7 +74,7 @@ clone_repo if [ ${DELETE_ONETIME} = 1 ] then - # rm -f /root/root.private + rm -f /root/root.private echo "Deleting /root/root.private" fi diff --git a/shared/bashrc b/shared/bashrc index b8722a5..0d430d4 100644 --- a/shared/bashrc +++ b/shared/bashrc @@ -125,7 +125,8 @@ _setprompt() { local ERRCODE="\$([[ \$? != 0 ]] && echo \"${DASH}(${Red}${X}${White})\")${DASH}" LINE1="${White}\342\224\214(${C1}\u@\h$EXTRAPROMPT${White})${ERRCODE}(${C1}\@ \d${White})" - local LINE2="\342\224\224\342\224\200(${C2}\w${White})-> " + # local LINE2="\342\224\224\342\224\200(${C2}\w${White})-> " + local LINE2="\342\224\224\342\224\200(${C1}\w${White})-> " export PS1="${NEWLINE}${LINE1}${NEWLINE}${LINE2}${Color_Off}" ;; 3line) diff --git a/SynoConfig.sh b/syno/SynoConfig.sh similarity index 100% rename from SynoConfig.sh rename to syno/SynoConfig.sh