202511201541

git_00_checkout_branch.sh

@@ -1,7 +1,5 @@
 #!/bin/env bash
 
-DIRNAME=`dirname $0`
-
 git_current_branch() {
  	git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'
 }
@@ -13,7 +11,7 @@ then
 	CIBLE=$CUR_BRANCH
 fi
 
-$DIRNAME/01_quick_commit.sh
+git_01_quick_commit.sh
 
 if [ ! "$CIBLE" = "$CUR_BRANCH" ];
 then

git_00_status.sh

@@ -1,7 +1,5 @@
 #!/bin/env bash
 
-DIRNAME=`dirname $0`
-
 git_current_branch() {
  	git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'
 }

git_01_quick_commit.sh

@@ -1,9 +1,8 @@
 #!/bin/env bash
 
-DIRNAME=`dirname $0`
 TIMESTAMP=`date "+%Y%m%d%H%M"`
 
-$DIRNAME/00_status.sh
+git_00_status.sh
 
 TEST=`git status | grep propre | wc -l`
 if [ $TEST -eq 0 ]

git_02_add_branch.sh

@@ -1,14 +1,12 @@
 #!/bin/env bash
 
-DIRNAME=`dirname $0`
-
 if [ "$1" == "" ]
 then
 	echo "Il faut préciser un nom de branche !"
 	exit 1
 fi
 
-$DIRNAME/01_quick_commit.sh
+git_01_quick_commit.sh
 
 courante=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/' | sed 's:(::g' | sed 's:)::g'`
 if [ $courante != develop ]
@@ -18,7 +16,7 @@ then
 	echo    # (optional) move to a new line
 	if [[ $REPLY =~ ^[YyOo]$ ]]
   	then
-		$DIRNAME/00_checkout_branch.sh develop
+		git_00_checkout_branch.sh develop
 	fi
 fi
 

git_03_push_branch.sh

@@ -1,7 +1,5 @@
 #!/bin/env bash
 
-DIRNAME=`dirname $0`
-
 git_current_branch() {
  	git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'
 }
@@ -13,16 +11,16 @@ then
 	CIBLE=$CUR_BRANCH
 fi
 
-$DIRNAME/01_quick_commit.sh
+git_01_quick_commit.sh
 
 if [ ! "$CIBLE" = "$CUR_BRANCH" ];
 then
-	$DIRNAME/00_checkout_branch.sh $CIBLE
+	git_00_checkout_branch.sh $CIBLE
 fi
 
 git push all
 
 if [ ! "$CIBLE" = "$CUR_BRANCH" ];
 then
-	$DIRNAME/00_checkout_branch.sh $CUR_BRANCH
+	git_00_checkout_branch.sh $CUR_BRANCH
 fi

git_04_merge_branch.sh

@@ -1,7 +1,5 @@
 #!/bin/env bash
 
-DIRNAME=`dirname $0`
-
 echo "Il vaudrait mieux passer par https://git.topisto.net/topisto/suivi_projets"
 read -p "Are you sure ?" -n 1 -r
 echo    # (optional) move to a new line
@@ -10,7 +8,7 @@ then
 
     # do dangerous stuff
 
-    $DIRNAME/01_quick_commit.sh
+    git_01_quick_commit.sh
 
     courante=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/' | sed 's:(::g' | sed 's:)::g'`
     cible=develop

git_05_delete_feature_branch.sh

@@ -1,5 +1,4 @@
 #!/bin/env bash
-DIRNAME=`dirname $0`
 
 git_current_branch() {
  	git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'
@@ -26,7 +25,7 @@ delete_branch() {
 	esac
 }
 
-$DIRNAME/03_push_branch.sh
+git_03_push_branch.sh
 
 if [ ! "$CUR_BRANCH" = "develop" ]
 then
@@ -35,7 +34,7 @@ then
 	echo    # (optional) move to a new line
 	if [[ $REPLY =~ ^[YyOo]$ ]]
   	then
-		$DIRNAME/00_checkout_branch.sh develop
+		git_00_checkout_branch.sh develop
 	fi
 fi
 

git_06_delete_all_features_branch.sh

@@ -1,10 +1,8 @@
 #!/bin/env bash
 
-DIRNAME=`dirname $0`
-
 for branche in $(git branch | cut -c 3-)
 do
 	echo "branch $branche detected"
-	$DIRNAME/05_delete_feature_branch.sh $branche
+	git_05_delete_feature_branch.sh $branche
 done