aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-03-21 19:43:36 -0300
committerSilvio Rhatto <rhatto@riseup.net>2017-03-21 19:43:36 -0300
commit94dc2af490b6edcbdde0e0397d4e81b5d62ba08d (patch)
treecd10dcf415ba265c14cc8be86f2741feb66022ea
parent0f20c6b2c514d2334d4301eb014e5defd763b1a2 (diff)
downloadapps-94dc2af490b6edcbdde0e0397d4e81b5d62ba08d.tar.gz
apps-94dc2af490b6edcbdde0e0397d4e81b5d62ba08d.tar.bz2
Inception: updates git app path
-rwxr-xr-xinception14
1 files changed, 7 insertions, 7 deletions
diff --git a/inception b/inception
index 4128807..0ef0577 100755
--- a/inception
+++ b/inception
@@ -22,7 +22,7 @@ function inception_init {
cd $DIRNAME
echo "Initializing submodules..."
- /usr/bin/git submodule update --init --recursive
+ $GIT submodule update --init --recursive
if [ ! -e "$HOME/.dotfiles" ]; then
echo "Cloning default dotfiles..."
@@ -34,10 +34,10 @@ function inception_init {
#echo "Checking latest tag..."
#cd $HOME/.dotfiles
- #$DIRNAME/utils-/usr/bin/git//usr/bin/git-check-tag
+ #$DIRNAME/utils-git/git-check-tag
#echo "Checking out the latest tag..."
- #$DIRNAME/utils-/usr/bin/git//usr/bin/git-checkout-tag
+ #$DIRNAME/utils-git/git-checkout-tag
echo "Checking dotfiles..."
$DIRNAME/metadot/metadot version
@@ -118,23 +118,23 @@ function inception_version {
echo "master branch:"
echo "=============="
echo ""
- ( cd $DIRNAME && /usr/bin/git log --show-signature -n 1 )
+ ( cd $DIRNAME && $GIT log --show-signature -n 1 )
echo ""
echo "origin/master branch:"
echo "====================="
echo ""
- ( cd $DIRNAME && /usr/bin/git log --show-signature -n 1 --branches=origin/master )
+ ( cd $DIRNAME && $GIT log --show-signature -n 1 --branches=origin/master )
}
# Fetch
function inception_fetch {
- ( cd $DIRNAME && /usr/bin/git fetch --all && /usr/bin/git log -n 1 --branches=origin/master )
+ ( cd $DIRNAME && $GIT fetch --all && $GIT log -n 1 --branches=origin/master )
}
# Merge
function inception_merge {
- ( cd $DIRNAME && /usr/bin/git merge origin/master && /usr/bin/git submodule update --init --recursive )
+ ( cd $DIRNAME && $GIT merge origin/master && $GIT submodule update --init --recursive )
}
# Main