From b8bd63257f1a1cc483678d56ba8fdba1869ba445 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 16 Mar 2017 10:54:51 -0300
Subject: Inception: Make sure we're running git directly and not any existing
 wrapper

---
 inception | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'inception')

diff --git a/inception b/inception
index 3d54387..022674e 100755
--- a/inception
+++ b/inception
@@ -7,6 +7,9 @@
 BASENAME="`basename $0`"
 DIRNAME="$(cd `dirname $0` &> /dev/null && pwd)"
 
+# Make sure we're running git directly and not any existing wrapper
+GIT="/usr/bin/git"
+
 # Usage
 function inception_usage {
   echo "usage: $BASENAME <action> [options]"
@@ -19,7 +22,7 @@ function inception_init {
     cd $DIRNAME
 
     echo "Initializing submodules..."
-    git submodule update --init --recursive
+    /usr/bin/git submodule update --init --recursive
 
     if [ ! -e "$HOME/.dotfiles" ]; then
       echo "Cloning default dotfiles..."
@@ -31,10 +34,10 @@ function inception_init {
 
     #echo "Checking latest tag..."
     #cd $HOME/.dotfiles
-    #$DIRNAME/utils-git/git-check-tag
+    #$DIRNAME/utils-/usr/bin/git//usr/bin/git-check-tag
 
     #echo "Checking out the latest tag..."
-    #$DIRNAME/utils-git/git-checkout-tag
+    #$DIRNAME/utils-/usr/bin/git//usr/bin/git-checkout-tag
 
     echo "Checking dotfiles..."
     $DIRNAME/metadot/metadot version
@@ -117,23 +120,23 @@ function inception_version {
   echo "master branch:"
   echo "=============="
   echo ""
-  ( cd $DIRNAME && git log --show-signature -n 1 )
+  ( cd $DIRNAME && /usr/bin/git log --show-signature -n 1 )
 
   echo ""
   echo "origin/master branch:"
   echo "====================="
   echo ""
-  ( cd $DIRNAME && git log --show-signature -n 1 --branches=origin/master )
+  ( cd $DIRNAME && /usr/bin/git log --show-signature -n 1 --branches=origin/master )
 }
 
 # Fetch
 function inception_fetch {
-  ( cd $DIRNAME && git fetch --all && git log -n 1 --branches=origin/master )
+  ( cd $DIRNAME && /usr/bin/git fetch --all && /usr/bin/git log -n 1 --branches=origin/master )
 }
 
 # Merge
 function inception_merge {
-  ( cd $DIRNAME && git merge origin/master && git submodule update --init --recursive )
+  ( cd $DIRNAME && /usr/bin/git merge origin/master && /usr/bin/git submodule update --init --recursive )
 }
 
 # Main
-- 
cgit v1.2.3