fix win vs mac

Author: wilsonmar

README.md

@@ -21,6 +21,13 @@ It calls a script that sets git configurations for a project (or globally)<br />
 <strong>git-sample-repo-create.ps1</strong> is a PowerShell script that
 creates a repository on your local clones your fork of a sample sample repository.
 
-All these scripts create a folder, but that folder is deleted at the beginning of each run.
+All these scripts create a folder, but that folder is deleted at the beginning of each run
+to make them "idempotent" in that each run of the script ends up in the same condition,
+whether run the first time or subsequent times.
+
+The scripts contain an <strong>exit</strong> after each set of steps
+so you can examine the impact of the whole sequence of commands.
+
+Additionally, diagrams (animated step-by-step in PowerPoint) have been prepared to illustrate the flow and sequence of commands.
 
 Enjoy!

git-sample-repo-create.ps1

@@ -36,8 +36,6 @@ $NOW = Get-Date -Format "yyyy-MM-ddTHH:mmzzz"
            echo "IsWindows=$IsWindows"
            echo "IsOSX=$IsOSX"
            echo "IsLinux=$IsLinux"
-    #if [ "$IsWindows" ]; then
-    #fi
 git --version
 
  exit #1
@@ -46,7 +44,7 @@ git --version
     $REPONAME='git-sample-repo'
 
         echo "******** STEP Delete $REPONAME remnant from previous run:"
-$FileExists = Test-Path $REPONAME
+    $FileExists = Test-Path $REPONAME
 if ($FileExists -eq $True ){
    # See https://technet.microsoft.com/en-ca/library/hh849765.aspx?f=255&MSPPError=-2147217396
    Remove-Item -path ${REPONAME} -Recurse -Force # instead of rm -rf ${REPONAME}

git-sisters-update.ps1

@@ -1,7 +1,7 @@
 # git-sisters-update.ps1 from within http://github.com/wilsonmar/git-utilities.
 # by Wilson Mar ([email protected], @wilsonmar)
 
-# This script was created for experiementing and learning Git.
+# This script was created for experiementing and learning Git with GitHub.
 # Git commands in this script are meant as examples for manual entry
 # explained during my live "Git and GitHub" tutorials and
 # explained at https://wilsonmar.github.io/git-commands-and-statuses/).
@@ -21,6 +21,8 @@
 # Sample call in MacOS running PowerShell for Mac: 
 #     chmod +x git-sisters-update.ps1
 #     ./git-sisters-update.ps1
+# results in "Add " as branch name. Alternately, run script with your own branch:
+#     ./git-sisters-update.ps1 "Add year 1979"
 
 # Last tested on MacOS 10.12 (Sierra) 2015-11-29
 # http://skimfeed.com/blog/windows-command-prompt-ls-equivalent-dir/
@@ -171,10 +173,17 @@ if (Test-Path ".gitignore"){
 #  exit #4
 
 
-# Run another script file to define git configuration at the repo level:
-Invoke-Expression "./git_client-config.ps1"
+        echo "******** Run PowerShell file for Git configurations at the repo level:"
+        $ScriptPath = Split-Path $MyInvocation.InvocationName
+        Write-Host "Path:" $MyInvocation.MyCommand.Path
+        # NOTE: PowerShell accepts both forward and backward slashes:
+        & ((Split-Path $MyInvocation.InvocationName) + '/git_client-config.ps1') 
+        # Alternately, use & to run scripts in same scope: 
+        # & "../git_client-config.ps1 global" #
+        # Alternately, use . to run scripts in child scope that will be thrown away: 
+        # . "../git_client-config.ps1 global" #
 
-#  exit #5
+  exit #5
 
 cd ${REPONAME}
 $CurrentDir = $(get-location).Path;
@@ -244,7 +253,12 @@ git l -10
         echo "******** git checkout master branch:"
 git checkout master
 
-    $CURRENT_BRANCH="feature1"
+    # Default is local:
+    if( $args[0] -eq "" ) {
+       $CURRENT_BRANCH="feature1"
+    }else{
+       $CURRENT_BRANCH=$args[0]
+    } 
         echo "******** git checkout new branch $CURRENT_BRANCH from master branch :"
 git checkout -b $CURRENT_BRANCH 
     git branch -avv
@@ -265,7 +279,7 @@ sisters_new_meta_file  Mimi     true   "boots"
         echo "******** git status : before git add :"
     git status
         echo "******** git add :"
-git add photo-info.md  bebe.md  heather.md  laurie.md  mimi.md
+git add .  # photo-info.md  bebe.md  heather.md  laurie.md  mimi.md
         echo "******** git status : after git add "
     git status
         echo "******** git commit of $CURRENT_YEAR (new commit SHA) :"

git_client-config.ps1

@@ -2,15 +2,22 @@
 # for running under PowerShell on Mac or Windows
 # See https://www.develves.net/blogs/asd/articles/using-git-with-powershell-on-windows-10/
 
+# Default is local:
+if( $args[0] -eq "global" ) {
+   $GIT_GLOBAL = "--global"
+}else{
+   $GIT_GLOBAL = "" # local 
+} 
+
         echo "******** Running script file git_client-config.ps1"
 # Change string from "" to "--global" 
-$GIT_GLOBAL = "" # "--global" 
 if( $GIT_GLOBAL -eq "--global" ) {
-        echo "******** Updating $GIT_GLOBAL repo using git config commands"
+        echo "******** Creating $GIT_GLOBAL repo in $HOME home dir using git config commands"
 }else{
-        echo "******** Updating local ../.git/config file using git config commands"
+        echo "******** Creating local ../.git/config file using git config commands"
 }
 
+
 # TODO: Create separate shell file to define git aliases for repo.
 # Verify settings:
     git config $GIT_GLOBAL core.filemode false