From 52a3750dce7c633be2b022356428ed1ddb75ec5d Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Thu, 22 Jun 2023 20:44:40 +0200 Subject: [PATCH] Add a script for restoring `git` --- scripts/Common/Config/git/flow/config.sh | 8 ++++++++ scripts/Common/Config/git/flow/install.ps1 | 8 ++++++++ scripts/Common/Config/git/flow/install.sh | 9 +-------- scripts/Common/Config/git/install.ps1 | 2 ++ scripts/Windows/OS/Manage.ps1 | 1 + scripts/Windows/Software/git/Manage.ps1 | 9 +++++---- 6 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 scripts/Common/Config/git/flow/config.sh create mode 100644 scripts/Common/Config/git/flow/install.ps1 create mode 100644 scripts/Common/Config/git/install.ps1 diff --git a/scripts/Common/Config/git/flow/config.sh b/scripts/Common/Config/git/flow/config.sh new file mode 100644 index 00000000..3f276805 --- /dev/null +++ b/scripts/Common/Config/git/flow/config.sh @@ -0,0 +1,8 @@ +git init; +git commit --allow-empty -m "Initial commit" > /dev/null; +git branch master || true; +git branch main || true; +git branch dev || true; +yes "" | git flow init > /dev/null 2>&1; +git flow config set --global master main > /dev/null; +git flow config set --global develop dev > /dev/null; diff --git a/scripts/Common/Config/git/flow/install.ps1 b/scripts/Common/Config/git/flow/install.ps1 new file mode 100644 index 00000000..f9db32d6 --- /dev/null +++ b/scripts/Common/Config/git/flow/install.ps1 @@ -0,0 +1,8 @@ +$tempDir = Join-Path $([System.IO.Path]::GetTempPath()) $([System.IO.Path]::GetRandomFileName()); +$null = New-Item -ItemType Directory $tempDir; + +Push-Location "$tempDir"; +. "$PSScriptRoot/config.sh"; +Pop-Location; + +Remove-Item -Recurse "$tempDir"; diff --git a/scripts/Common/Config/git/flow/install.sh b/scripts/Common/Config/git/flow/install.sh index 7418f336..6ca0ced7 100755 --- a/scripts/Common/Config/git/flow/install.sh +++ b/scripts/Common/Config/git/flow/install.sh @@ -1,13 +1,6 @@ #!/bin/bash contextRoot="$(mktemp -d)"; pushd "$contextRoot" > /dev/null; -git init; -git commit --allow-empty -m "Initial commit" > /dev/null; -git branch master || true; -git branch main || true; -git branch dev || true; -yes "" | git flow init > /dev/null 2>&1; -git flow config set --global master main > /dev/null; -git flow config set --global develop dev > /dev/null; +. "${BASH_SOURCE%/*}/config.sh"; popd > /dev/null; rm -rf "$contextRoot"; diff --git a/scripts/Common/Config/git/install.ps1 b/scripts/Common/Config/git/install.ps1 new file mode 100644 index 00000000..9fdf30f7 --- /dev/null +++ b/scripts/Common/Config/git/install.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot/setup/install.sh"; +. "$PSScriptRoot/flow/install.ps1"; diff --git a/scripts/Windows/OS/Manage.ps1 b/scripts/Windows/OS/Manage.ps1 index 98223626..a422e209 100644 --- a/scripts/Windows/OS/Manage.ps1 +++ b/scripts/Windows/OS/Manage.ps1 @@ -60,6 +60,7 @@ function Invoke-WindowsRestore([Context] $context) { } Invoke-FileRestore $context; + Invoke-RestoreGit $context; Remove-Item -Recurse $context.RootDir; } diff --git a/scripts/Windows/Software/git/Manage.ps1 b/scripts/Windows/Software/git/Manage.ps1 index 9b21aede..675b3338 100644 --- a/scripts/Windows/Software/git/Manage.ps1 +++ b/scripts/Windows/Software/git/Manage.ps1 @@ -1,8 +1,9 @@ . "$PSScriptRoot/../../Scripts/Context.ps1"; $null = New-Module { - $configBaseName = ".gitconfig"; - $configPath = Join-Path "$HOME" "$configBaseName"; - - function Invoke-BackupGit([Context] $context) {} + function Invoke-BackupGit([Context] $context) {} + + function Invoke-RestoreGit([Context] $context) { + . "$PSScriptRoot/../../../Common/Config/git/install.ps1"; + } } \ No newline at end of file