Skip to contentSkip to conversation

version.sh: clean up the code

PATCH In review Américo Wang 2 participants 3 messages Jan 19, 2009 – Jan 22, 2009 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 version.sh: clean up the code

- In bash, integer comparation should use '-eq', not '=='.
- Remove code for Mercurial, since btrfs now uses git.

---

version.sh +2 -22
index 92c3953..e69f8f8 100644
@@ -9,7 +9,7 @@
 v="Btrfs v0.17"
 
 which git &> /dev/null
-if [ $? == 0 -a -d .git ]; then
+if [ $? -eq 0 -a -d .git ]; then
     if head=`git rev-parse --verify HEAD 2>/dev/null`; then
         if tag=`git describe --tags 2>/dev/null`; then
             v="$tag"
@@ -23,26 +23,6 @@ if [ $? == 0 -a -d .git ]; then
         fi
     fi
 fi
-
-which hg &> /dev/null
-if [ $? == 0 -a -d .hg ]; then
-	last=$(hg tags | grep -m1 -o '^v[0-9.]\+')
-	 
-	# now check if the repo has commits since then...
-	if [[ $(hg id -t) == $last || \
-	    $(hg di -r "$last:." | awk '/^diff/{print $NF}' | sort -u) == .hgtags ]]
-	then
-	    # check if it's dirty
-	    if [[ $(hg id | cut -d' ' -f1) == *+ ]]; then
-		v=$last+
-	    else
-		v=$last
-	    fi
-	else
-	    # includes dirty flag
-	    v=$last+$(hg id -i)
-	fi
-fi
  
 echo "#ifndef __BUILD_VERSION" > .build-version.h
 echo "#define __BUILD_VERSION" >> .build-version.h
@@ -51,7 +31,7 @@ echo "#endif" >> .build-version.h
 
 diff -q version.h .build-version.h >& /dev/null
 
-if [ $? == 0 ]; then
+if [ $? -eq 0 ]; then
     rm .build-version.h
     exit 0
 fi
#1 lore raw
Quoted 3 lines · On Mon, 2009-01-19 at 21:51 +0800, Am=C3=A9rico Wang wrote:

- In bash, integer comparation should use '-eq', not '=3D=3D'.
- Remove code for Mercurial, since btrfs now uses git. =20

version.sh should be removed from the mainline sources and only live in the standalone tree. So, I'll apply this one a bit later.

-chris

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" = in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#2 lore raw
Quoted 6 lines · Chris Mason
Quoted 3 lines · On Mon, 2009-01-19 at 21:51 +0800, Am=C3=A9rico Wang wrote:

- In bash, integer comparation should use '-eq', not '=3D=3D'.
- Remove code for Mercurial, since btrfs now uses git. =20

version.sh should be removed from the mainline sources and only live i=

n

Quoted 2 lines

the standalone tree. So, I'll apply this one a bit later.

OK then.

--=20
"Against stupidity, the gods themselves, contend in vain."

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" = in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html