zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge trunk r3949 "Fix issues in clfs"

Browse source
This commit is contained in:
Pierre Labastie 2017-04-02 08:46:55 +00:00
parent 10bc5b9130
commit de10f6c5a5
2 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
common/libs/func_book_parser
View file

@ -8,9 +8,18 @@ get_book() { #
cd $JHALFSDIR cd $JHALFSDIR
if [ -z $WORKING_COPY ] ; then if [ -z $WORKING_COPY ] ; then
# Check for Subversion instead of just letting the script hit 'svn' and fail. # Check for Subversion or git instead of just letting the script fail.
test `type -p svn` || eval "echo \"This feature requires Subversion.\" case $PROGNAME in
exit 1" lfs | hlfs)
test `type -p svn` || eval "echo \"This feature requires Subversion.\"
exit 1"
;;
clfs*)
test `type -p git` || eval "echo \"This feature requires Git.\"
exit 1"
;;
esac
echo -n "Downloading the $PROGNAME document, $LFSVRS version... " echo -n "Downloading the $PROGNAME document, $LFSVRS version... "
case $PROGNAME in case $PROGNAME in
@ -31,17 +40,22 @@ get_book() { #
echo $TREE echo $TREE
git clone $GIT ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1 git clone $GIT ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1
if [ ! $TREE == "development" ]; then if [ ! $TREE == "development" ]; then
cd ${PROGNAME}-$LFSVRS pushd ${PROGNAME}-$LFSVRS > /dev/null
echo "Checking out $LFSVRS at $PWD in $TREE" echo "Checking out $LFSVRS at $PWD in $TREE"
git checkout ${TREE} >>$LOGDIR/$LOG 2>&1 git checkout ${TREE} >>$LOGDIR/$LOG 2>&1
popd > /dev/null
fi fi
else else
cd ${PROGNAME}-$LFSVRS cd ${PROGNAME}-$LFSVRS
case $PROGNAME in case $PROGNAME in
clfs*) git pull >>$LOGDIR/$LOG 2>&1 clfs*)
if [ ! $TREE == "development" ]; then # If the repo is in "detached head" state, git pull fails, so get
git checkout ${TREE} >>$LOGDIR/$LOG 2>&1 # back first to master:
fi git checkout master >>$LOGDIR/$LOG 2>&1
git pull >>$LOGDIR/$LOG 2>&1
if [ ! $TREE == "development" ]; then
git checkout ${TREE} >>$LOGDIR/$LOG 2>&1
fi
;; ;;
lfs | hlfs) svn up >>$LOGDIR/$LOG 2>&1 ;; lfs | hlfs) svn up >>$LOGDIR/$LOG 2>&1 ;;
*) ;; *) ;;
@ -49,7 +63,7 @@ get_book() { #
fi fi
echo -ne "done\n" echo -ne "done\n"
else else # Working copy
echo -ne "Using $BOOK as book's sources ...\n" echo -ne "Using $BOOK as book's sources ...\n"
fi fi
} }

3
common/urls.xsl
View file

@ -105,6 +105,9 @@
<xsl:when test="contains($dirname, 'udev')"> <xsl:when test="contains($dirname, 'udev')">
<xsl:text>udev/</xsl:text> <xsl:text>udev/</xsl:text>
</xsl:when> </xsl:when>
<xsl:when test="contains($dirname, 'iputils')">
<xsl:text>iputils/</xsl:text>
</xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:value-of select="$dirname"/> <xsl:value-of select="$dirname"/>
<xsl:text>/</xsl:text> <xsl:text>/</xsl:text>