.
This commit is contained in:
@ -2,8 +2,6 @@
|
|||||||
set check_computername=%COMPUTERNAME%
|
set check_computername=%COMPUTERNAME%
|
||||||
echo "Found computer %check_computername%"
|
echo "Found computer %check_computername%"
|
||||||
|
|
||||||
set PACKAGES="C:\Packages"
|
|
||||||
set WPUBLIC="C:\wPublic"
|
|
||||||
set SCRIPTS="C:\Scripts"
|
set SCRIPTS="C:\Scripts"
|
||||||
set GIT="C:\Program Files\Git\git-bash.exe"
|
set GIT="C:\Program Files\Git\git-bash.exe"
|
||||||
|
|
||||||
@ -11,9 +9,6 @@ mkdir %SCRIPTS%
|
|||||||
|
|
||||||
|
|
||||||
if exist %GIT% (
|
if exist %GIT% (
|
||||||
%GIT% -c "git config --global --add safe.directory C:/Scripts/wBase"
|
|
||||||
%GIT% -c "git config --global --add safe.directory C:/Scripts/wLocal"
|
|
||||||
|
|
||||||
|
|
||||||
echo "Found git. Attempting pull"
|
echo "Found git. Attempting pull"
|
||||||
cd %SCRIPTS%\wBase
|
cd %SCRIPTS%\wBase
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
@echo on
|
@echo off
|
||||||
set check_computername=%COMPUTERNAME%
|
set check_computername=%COMPUTERNAME%
|
||||||
echo "Found computer %check_computername%"
|
echo "Found computer %check_computername%"
|
||||||
|
|
||||||
@ -18,16 +18,6 @@ if exist %GIT% (
|
|||||||
del /f/s/q "C:\Scripts\wPublic\*.*"
|
del /f/s/q "C:\Scripts\wPublic\*.*"
|
||||||
rmdir /s/q "C:\Scripts\wPublic"
|
rmdir /s/q "C:\Scripts\wPublic"
|
||||||
|
|
||||||
%GIT% -c "git config --global --add safe.directory C:/Scripts/wBase"
|
|
||||||
%GIT% -c "git config --global --add safe.directory C:/Scripts/wLocal"
|
|
||||||
%GIT% -c "git config --global --add safe.directory C:/Scripts/wPublic"
|
|
||||||
|
|
||||||
%GIT% -c "git config --global core.sshCommand "ssh -i ~/.ssh/giteadeploy -F /dev/null""
|
|
||||||
%GIT% -c "git config --global user.name "USER""
|
|
||||||
%GIT% -c "git config --global user.email "USER@DOMAIN.com""
|
|
||||||
%GIT% -c "git config --global init.defaultBranch main"
|
|
||||||
%GIT% -c "git config --global pull.rebase "False""
|
|
||||||
|
|
||||||
echo "Found git."
|
echo "Found git."
|
||||||
echo "Attempting clone of wBase"
|
echo "Attempting clone of wBase"
|
||||||
cd %SCRIPTS%
|
cd %SCRIPTS%
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
@echo on
|
@echo off
|
||||||
set check_computername=%COMPUTERNAME%
|
set check_computername=%COMPUTERNAME%
|
||||||
echo "Found computer %check_computername%"
|
echo "Found computer %check_computername%"
|
||||||
|
|
||||||
|
|||||||
@ -9,9 +9,7 @@ mkdir %SCRIPTS%
|
|||||||
|
|
||||||
|
|
||||||
if exist %GIT% (
|
if exist %GIT% (
|
||||||
%GIT% -c "git config --global --add safe.directory C:/Scripts/wBase"
|
|
||||||
%GIT% -c "git config --global --add safe.directory C:/Scripts/wLocal"
|
|
||||||
%GIT% -c "git config --global --add safe.directory C:/Scripts/wPublic"
|
|
||||||
|
|
||||||
echo "Found git."
|
echo "Found git."
|
||||||
echo "Attempting pull of wBase"
|
echo "Attempting pull of wBase"
|
||||||
|
|||||||
@ -5,6 +5,7 @@ echo "START: %~n0"
|
|||||||
|
|
||||||
echo "Fixing time...."
|
echo "Fixing time...."
|
||||||
call %BASE%\baseFixTime.bat
|
call %BASE%\baseFixTime.bat
|
||||||
|
call %BASE%\BaseGitConfig.bat
|
||||||
|
|
||||||
del C:\Scripts\bSecrets\b_Syncthing.bat
|
del C:\Scripts\bSecrets\b_Syncthing.bat
|
||||||
del C:\Scripts\lSecrets\l_Syncthing.bat
|
del C:\Scripts\lSecrets\l_Syncthing.bat
|
||||||
|
|||||||
Reference in New Issue
Block a user