From e9dd4329b0115d48a8a295cbadb12d1862c62aa0 Mon Sep 17 00:00:00 2001
From: Markus Fleschutz <markus.fleschutz@atcsim.de>
Date: Tue, 20 Apr 2021 08:06:33 +0200
Subject: [PATCH] Improve output of fetch-repo.ps1 and pull-repo.ps1

---
 Scripts/fetch-repo.ps1 | 12 ++++++++----
 Scripts/pull-repo.ps1  |  9 +++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Scripts/fetch-repo.ps1 b/Scripts/fetch-repo.ps1
index f44a0a91..9c8e7bfe 100755
--- a/Scripts/fetch-repo.ps1
+++ b/Scripts/fetch-repo.ps1
@@ -1,7 +1,7 @@
 #!/usr/bin/pwsh
 <#
 .SYNTAX       fetch-repo.ps1 [<repo-dir>]
-.DESCRIPTION  fetches updates for the current/given Git repository (including submodules)
+.DESCRIPTION  fetches updates for a local Git repository (including submodules)
 .LINK         https://github.com/fleschutz/PowerShell
 .NOTES        Author: Markus Fleschutz / License: CC0
 #>
@@ -9,14 +9,18 @@
 param($RepoDir = "$PWD")
 
 try {
-	"⏳ Fetching updates for Git repository $($RepoDir)..."
-
+	$RepoDir = resolve-path "$RepoDir"
 	if (-not(test-path "$RepoDir" -pathType container)) { throw "Can't access directory: $RepoDir" }
 	set-location "$RepoDir"
+	
+	"⏳ Fetching updates for Git repository 📂$RepoDir ..."
+	
+	$Null = (git --version)
+	if ($lastExitCode -ne "0") { throw "Can't execute 'git' - make sure Git is installed and available" }
 
 	& git fetch --all --recurse-submodules --jobs=4
 	if ($lastExitCode -ne "0") {
-		# retry once:
+		write-warning "Retrying once ..."
 		start-sleep -milliseconds 1000
 		& git fetch --all --recurse-submodules --jobs=1
 		if ($lastExitCode -ne "0") { throw "'git fetch' failed (twice)" }
diff --git a/Scripts/pull-repo.ps1 b/Scripts/pull-repo.ps1
index 060d38e7..dfe717fa 100755
--- a/Scripts/pull-repo.ps1
+++ b/Scripts/pull-repo.ps1
@@ -1,7 +1,7 @@
 #!/usr/bin/pwsh
 <#
 .SYNTAX       pull-repo.ps1 [<repo-dir>]
-.DESCRIPTION  pulls updates a Git repository (including submodules)
+.DESCRIPTION  pulls updates for a local Git repository (including submodules)
 .LINK         https://github.com/fleschutz/PowerShell
 .NOTES        Author: Markus Fleschutz / License: CC0
 #>
@@ -9,10 +9,11 @@
 param($RepoDir = "$PWD")
 
 try {
-	"⏳ Pulling updates for Git repository $($RepoDir)..."
-
+	$RepoDir = resolve-path "$RepoDir"
 	if (-not(test-path "$RepoDir" -pathType container)) { throw "Can't access directory: $RepoDir" }
 	set-location "$RepoDir"
+	
+	"⏳ Updating Git repository 📂$RepoDir ..."
 
 	$Null = (git --version)
 	if ($lastExitCode -ne "0") { throw "Can't execute 'git' - make sure Git is installed and available" }
@@ -20,7 +21,7 @@ try {
 	& git pull --all --recurse-submodules --jobs=4
 	if ($lastExitCode -ne "0") { throw "'git pull' failed" }
 
-	"✔️ Git repository $RepoDir is up to date"
+	"✔️ updated Git repository 📂$RepoDir"
 	exit 0
 } catch {
 	write-error "ERROR: line $($_.InvocationInfo.ScriptLineNumber): $($Error[0])"