From 0ca78c6925f698ab1aafa5654f844ef166bc9eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Tue, 25 Oct 2022 06:41:49 +0200 Subject: [PATCH] change default server from git to gitea --- bin/git-myshellconfig-checkout | 1 - defaults.conf | 2 +- myshell_git_sync | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout index 8e24ad1..6c6738b 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -93,7 +93,6 @@ if $dorepoupdate; then loginfo "$MSC_GIT submodule sync" logdebug "$($MSC_GIT submodule sync 2>&1)" loginfo "fetch repo${dosubmodupdate:+ and submodules}" - #$MSC_GIT fetch ${dosubmodupdate:+--recurse-submodules} ${MSC_GIT_REMOTE_NAME} -p 2>>"${MSC_LOGFILE}"|| { logwarning fetch failed; gitupdateend; exit 1; } $MSC_GIT fetch ${dosubmodupdate:+--recurse-submodules} ${MSC_GIT_REMOTE_NAME} -p 2>>"${MSC_LOGFILE}"|| { logwarning fetch failed; gitupdateend; exit 1; } if ${dosubmodupdate:-false}; then lastupdatesubmodules diff --git a/defaults.conf b/defaults.conf index 619b0ed..385b636 100644 --- a/defaults.conf +++ b/defaults.conf @@ -3,7 +3,7 @@ export MSC_GIT_REPO_UPDATE_DEFAULT=true export MSC_GIT_REPO_UPDATE_INTERVALL_DEFAULT=48 #intervall in hours export MSC_GIT_SUBMODULES_UPDATE_DEFAULT=true export MSC_GIT_SUBMODULES_UPDATE_INTERVALL_DEFAULT=196 #intervall in hours -export MSC_GIT_SUBMODULES_SERVER_DEFAULT="git://git.schuerz.at/github.com/" +export MSC_GIT_SUBMODULES_SERVER_DEFAULT="git://github.com/" export MSC_GIT_CHECKOUTSCRIPT_OPTIONS_DEFAULT="-h" export MSC_GIT_TIMEOUT_DEFAULT=5s export MSC_GIT_CHECKOUT_TIMEOUT_DEFAULT=20s diff --git a/myshell_git_sync b/myshell_git_sync index 62ad427..1f0a1f0 100644 --- a/myshell_git_sync +++ b/myshell_git_sync @@ -12,7 +12,7 @@ if ! $SSHS; then MSC_GIT_PROTOCOL_HTTP="http://" MSC_GIT_PROTOCOL_SSH="git@" MSC_GIT_PROTOCOL_FILE="" - [ -z "${MSC_GIT_SERVER+x}" ] && MSC_GIT_SERVER="git.schuerz.at" + [ -z "${MSC_GIT_SERVER+x}" ] && MSC_GIT_SERVER="gitea.schuerz.at" [ -z "${MSC_GIT_REPO_NAME+x}" ] && MSC_GIT_REPO_NAME="$(basename $MSC_BASE).git" [ -z "${MSC_GIT_REPO_PATH_HTTP+x}" ] && MSC_GIT_REPO_PATH_HTTP="/public/" [ -z "${MSC_GIT_REPO_PATH_SSH+x}" ] && MSC_GIT_REPO_PATH_SSH=":public/"