[gentoo-commits] proj/apache:master commit in: /

[gentoo-commits] proj/apache:master commit in: /

[Lars Wendler]

commit:     4fed525d6b5cea0ded9c4bab70a3dd36f0e39928
Author:     Benedikt Boehm <hollow <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 08:32:03 2009 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 08:32:03 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/apache.git;a=commit;h=4fed525d

fix digest generation

---
 rolltarball.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rolltarball.sh b/rolltarball.sh
index 8c74c54..193b1bd 100755
--- a/rolltarball.sh
+++ b/rolltarball.sh
@@ -520,7 +520,7 @@ build_tarball() {
 		pretend && einfo "  Regenerate digests"
 		pretend || {
 			ebegin "Regenerating digests"
-			ebuild ${EBUILD} digest >&9
+			ebuild --force ${EBUILD} manifest >&9
 			eend $?
 		}
 	else

[gentoo-commits] proj/apache:master commit in: /

[Lars Wendler]

commit:     c74a1295bf28ba0bf0f0de5324bf70aecba4e501
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 20 20:12:08 2014 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 20:12:08 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/apache.git;a=commit;h=c74a1295

Modifications to support GIT instead of SVN

---
 rolltarball.sh | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/rolltarball.sh b/rolltarball.sh
index 193b1bd..d296b5b 100755
--- a/rolltarball.sh
+++ b/rolltarball.sh
@@ -12,13 +12,16 @@
 # Contributors:
 #	Michael Stewart <vericgar@gentoo.org> (Primary Maintainer)
 #	Christian Parpart <trapni@gentoo.org>
+#	Lars Wendler <polynomial-c@gentoo.org>
 #
 # Changes:
 #	05-Jun-2005	Complete rewrite to clean up code
+#	20-Apr-2014	Use git instead of svn
 #
-MYVERSION='$Revision$'
-MYVERSION=${MYVERSION#* }
-MYVERSION=${MYVERSION% *}
+
+# Please increase version number before each commit which includes changes to
+# this script.
+MYVERSION='2.0'
 
 # ********** Begin functions **********
 
@@ -59,7 +62,7 @@ Where options is any of:
     --quiet         Set verbosity to 0
 -q                  Lower verbosity by 1
 -s  --datestamp     Use alternate datestamp
--u  --user=username Gentoo Username (Required)
+-u  --user=username Gentoo Username (Default: auto-detected)
     --verbosity=n   Verbosity Level (0-4)
 -v                  Increase verbosity by 1
 
@@ -335,12 +338,8 @@ fi
 
 if [ -z "${G_USER}" ]
 then
-# Autodetect not available for SVN
-#	G_USER=$(cat CVS/Root)
-#	G_USER=${G_USER/:ext:/}
-#	G_USER=${G_USER%@*}
-#	einfo "Detected Gentoo Developer: ${G_USER}"
-	usage "Gentoo Developer Not specified!"
+	G_USER="$(git log -1 | grep ^Author | sed 's&.*<\([[:alnum:]\._-]\+\)@.*>&\1&')"
+	einfo "Detected Gentoo Developer: ${G_USER}"
 fi
 
 edebug "Current configuration:"
@@ -359,8 +358,8 @@ edebug "  VERBOSE: ${VERBOSE}"
 my_mtime=$(stat --format=%Y $0)
 
 ebegin "Updating tree"
-svn up >&9
-eend $? "svn update failed!" || die
+git pull >&9
+eend $? "git update failed!" || die
 
 new_mtime=$(stat --format=%Y $0)
 if [ "${my_mtime}" -ne "${new_mtime}" ]
@@ -432,8 +431,8 @@ build_tarball() {
 		echo ${CURTIME} > ${TB_DIR}/DATESTAMP
 		echo "Packaged by ${G_USER}" >> ${TB_DIR}/DATESTAMP
 		echo "$0 v${MYVERSION}" >> ${TB_DIR}/DATESTAMP
-		edebug "Create bzip2-ed tarball ${TB} from ${TB_DIR} excluding .svn"
-		tar --create --bzip2 --verbose --exclude=.svn --exclude=*~ --file ${TB} ${TB_DIR} >&9
+		edebug "Create bzip2-ed tarball ${TB} from ${TB_DIR} excluding vcs files"
+		tar --create --bzip2 --verbose --exclude-vcs --exclude=*~ --file ${TB} ${TB_DIR} >&9
 		eend $? "Tarball creation failed" || die
 		edebug "Remove temporary directory" 
 		rm -rf ${TB_DIR} || ewarn "Couldn't clean up, manually remove ${TB_DIR}/"

[gentoo-commits] proj/apache:master commit in: /

[Lars Wendler]

commit:     6c86ae4c69a6b1baed8be02a6d1dc72d08d88e38
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 20 20:39:06 2014 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 20:39:06 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/apache.git;a=commit;h=6c86ae4c

Change GENTOO_PATCHNAME in ebuild as well

---
 rolltarball.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/rolltarball.sh b/rolltarball.sh
index d296b5b..1962c00 100755
--- a/rolltarball.sh
+++ b/rolltarball.sh
@@ -16,7 +16,8 @@
 #
 # Changes:
 #	05-Jun-2005	Complete rewrite to clean up code
-#	20-Apr-2014	Use git instead of svn
+#	20-Apr-2014	Use git instead of svn. Change patchname in ebuild as
+#			well
 #
 
 # Please increase version number before each commit which includes changes to
@@ -373,6 +374,7 @@ edebug "Detecting settings for tarball based on ebuild name"
 
 EBUILD_BASE=$(basename ${EBUILD})
 EBUILD_NAME=${EBUILD_BASE/-[0-9]*/}
+TB_NAME="gentoo-${EBUILD_NAME}"
 TB_VER=${EBUILD_BASE/${EBUILD_NAME}-/}
 TB_VER=${TB_VER/.ebuild/}
 DATESTAMP=${DATESTAMP:-$(date +%Y%m%d)}
@@ -380,8 +382,8 @@ DATESTAMP=${DATESTAMP:-$(date +%Y%m%d)}
 case ${EBUILD_NAME} in
 	apache)
 		TREE=${TB_VER%.*}
-		TB=gentoo-apache-${TB_VER}-${DATESTAMP}.tar.bz2
-		TB_DIR=gentoo-apache-${TB_VER}
+		TB=${TB_NAME}-${TB_VER}-${DATESTAMP}.tar.bz2
+		TB_DIR=${TB_NAME}-${TB_VER}
 		;;
 	gentoo-webroot-default)
 		TREE=gentoo-webroot-default
@@ -496,11 +498,12 @@ build_tarball() {
 	then
 		if [ -r ${EBUILD} ]
 		then
-			pretend && einfo "  Update GENTOO_PATCHSTAMP and GENTOO_DEVELOPER"
+			pretend && einfo "  Update GENTOO_PATCHSTAMP, GENTOO_DEVELOPER and GENTOO_PATCHNAME"
 			pretend || {
-				ebegin "Updating GENTOO_PATCHSTAMP and GENTOO_DEVELOPER"
+				ebegin "Updating GENTOO_PATCHSTAMP, GENTOO_DEVELOPER and GENTOO_PATCHNAME"
 				sed -i -e "s/GENTOO_PATCHSTAMP=\".*\"/GENTOO_PATCHSTAMP=\"${DATESTAMP}\"/" ${EBUILD} && 
-				sed -i -e "s/GENTOO_DEVELOPER=\".*\"/GENTOO_DEVELOPER=\"${G_USER}\"/" ${EBUILD}
+				sed -i -e "s/GENTOO_DEVELOPER=\".*\"/GENTOO_DEVELOPER=\"${G_USER}\"/" ${EBUILD} &&
+				sed -i -e "s/GENTOO_PATCHNAME=\".*\"/GENTOO_PATCHNAME=\"${TB_NAME}-${TB_VER}\"/" ${EBUILD}
 				eend $? "Failed to modify ebuild" || {
 					einfo "It's highly recommended that you delete the ebuild"
 					einfo "and cvs up and then modify the ebuild manually."

[gentoo-commits] proj/apache:master commit in: /

[Lars Wendler]

commit:     679d026ac3eb324de0763490832739e228e75bee
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  1 11:12:19 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 11:12:19 2020 +0000
URL:        https://gitweb.gentoo.org/proj/apache.git/commit/?id=679d026a

Add xz compressed tarballs to .gitignore

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index bb6dce2..f0818d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gentoo-apache-*.tar.bz2
+gentoo-apache-*.tar.xz

[gentoo-commits] proj/apache:master commit in: /

[Lars Wendler]

commit:     d8466105dfb6f3323561445488afa300634013b0
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  1 11:21:17 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 11:21:17 2020 +0000
URL:        https://gitweb.gentoo.org/proj/apache.git/commit/?id=d8466105

rolltarball.sh: Create xz compressed tarballs

instead of bzip2 compressed ones

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 rolltarball.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/rolltarball.sh b/rolltarball.sh
index 1962c00..2660564 100755
--- a/rolltarball.sh
+++ b/rolltarball.sh
@@ -18,11 +18,12 @@
 #	05-Jun-2005	Complete rewrite to clean up code
 #	20-Apr-2014	Use git instead of svn. Change patchname in ebuild as
 #			well
+#       01-Dec-2020	Replace bzip2 with xz to compress tarballs
 #
 
-# Please increase version number before each commit which includes changes to
-# this script.
-MYVERSION='2.0'
+# Please increase version number before or on each commit which includes
+# changes to this script.
+MYVERSION='2.1'
 
 # ********** Begin functions **********
 
@@ -433,8 +434,8 @@ build_tarball() {
 		echo ${CURTIME} > ${TB_DIR}/DATESTAMP
 		echo "Packaged by ${G_USER}" >> ${TB_DIR}/DATESTAMP
 		echo "$0 v${MYVERSION}" >> ${TB_DIR}/DATESTAMP
-		edebug "Create bzip2-ed tarball ${TB} from ${TB_DIR} excluding vcs files"
-		tar --create --bzip2 --verbose --exclude-vcs --exclude=*~ --file ${TB} ${TB_DIR} >&9
+		edebug "Create xz-ed tarball ${TB} from ${TB_DIR} excluding vcs files"
+		tar --create --xz --verbose --exclude-vcs --exclude=*~ --file ${TB} ${TB_DIR} >&9
 		eend $? "Tarball creation failed" || die
 		edebug "Remove temporary directory" 
 		rm -rf ${TB_DIR} || ewarn "Couldn't clean up, manually remove ${TB_DIR}/"

[gentoo-commits] proj/apache:master commit in: /

[Lars Wendler]

commit:     dcda83a75b1770bcc72fabe6a4ae551a97a2da9f
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  1 12:25:51 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 12:25:51 2020 +0000
URL:        https://gitweb.gentoo.org/proj/apache.git/commit/?id=dcda83a7

Revert "rolltarball.sh: Create xz compressed tarballs"

This reverts commit d8466105dfb6f3323561445488afa300634013b0
because of unresolved issues

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 rolltarball.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/rolltarball.sh b/rolltarball.sh
index 2660564..1962c00 100755
--- a/rolltarball.sh
+++ b/rolltarball.sh
@@ -18,12 +18,11 @@
 #	05-Jun-2005	Complete rewrite to clean up code
 #	20-Apr-2014	Use git instead of svn. Change patchname in ebuild as
 #			well
-#       01-Dec-2020	Replace bzip2 with xz to compress tarballs
 #
 
-# Please increase version number before or on each commit which includes
-# changes to this script.
-MYVERSION='2.1'
+# Please increase version number before each commit which includes changes to
+# this script.
+MYVERSION='2.0'
 
 # ********** Begin functions **********
 
@@ -434,8 +433,8 @@ build_tarball() {
 		echo ${CURTIME} > ${TB_DIR}/DATESTAMP
 		echo "Packaged by ${G_USER}" >> ${TB_DIR}/DATESTAMP
 		echo "$0 v${MYVERSION}" >> ${TB_DIR}/DATESTAMP
-		edebug "Create xz-ed tarball ${TB} from ${TB_DIR} excluding vcs files"
-		tar --create --xz --verbose --exclude-vcs --exclude=*~ --file ${TB} ${TB_DIR} >&9
+		edebug "Create bzip2-ed tarball ${TB} from ${TB_DIR} excluding vcs files"
+		tar --create --bzip2 --verbose --exclude-vcs --exclude=*~ --file ${TB} ${TB_DIR} >&9
 		eend $? "Tarball creation failed" || die
 		edebug "Remove temporary directory" 
 		rm -rf ${TB_DIR} || ewarn "Couldn't clean up, manually remove ${TB_DIR}/"

[gentoo-commits] proj/apache:master commit in: /

[Lars Wendler]

commit:     382ec4f5de6d1bfb9a6b63973efecb3efbaebdd1
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 14:24:38 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 14:25:32 2021 +0000
URL:        https://gitweb.gentoo.org/proj/apache.git/commit/?id=382ec4f5

rolltarball.sh: Check for 'Commit:' to determine G_USER

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 rolltarball.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rolltarball.sh b/rolltarball.sh
index 1962c00..26ccb20 100755
--- a/rolltarball.sh
+++ b/rolltarball.sh
@@ -22,7 +22,7 @@
 
 # Please increase version number before each commit which includes changes to
 # this script.
-MYVERSION='2.0'
+MYVERSION='2.1'
 
 # ********** Begin functions **********
 
@@ -339,7 +339,7 @@ fi
 
 if [ -z "${G_USER}" ]
 then
-	G_USER="$(git log -1 | grep ^Author | sed 's&.*<\([[:alnum:]\._-]\+\)@.*>&\1&')"
+	G_USER="$(git log --pretty=fuller -1 | grep '^Commit:' | sed 's&.*<\([[:alnum:]\._-]\+\)@.*>&\1&')"
 	einfo "Detected Gentoo Developer: ${G_USER}"
 fi
 

[gentoo-commits] proj/apache:master commit in: /

[Lars Wendler]

commit:     8be92d55525425d8805677539221486e8f5e3437
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 14:37:34 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 14:37:34 2021 +0000
URL:        https://gitweb.gentoo.org/proj/apache.git/commit/?id=8be92d55

rolltarball.sh: Simplified G_USER detection

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 rolltarball.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rolltarball.sh b/rolltarball.sh
index 26ccb20..456d3d5 100755
--- a/rolltarball.sh
+++ b/rolltarball.sh
@@ -339,7 +339,7 @@ fi
 
 if [ -z "${G_USER}" ]
 then
-	G_USER="$(git log --pretty=fuller -1 | grep '^Commit:' | sed 's&.*<\([[:alnum:]\._-]\+\)@.*>&\1&')"
+	G_USER="$(git log --pretty=fuller -1 | sed -n '/^Commit:/s&.*<\([[:alnum:]\._-]\+\)@.*>&\1&p')"
 	einfo "Detected Gentoo Developer: ${G_USER}"
 fi
 

[gentoo-commits] proj/apache:master commit in: /

[Lars Wendler]

commit:     a1e9b3cf52660f09451ae056b98400d13fee2ae5
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 14:52:57 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 14:52:57 2021 +0000
URL:        https://gitweb.gentoo.org/proj/apache.git/commit/?id=a1e9b3cf

rolltarball.sh: Use bash features as we already have bash in shebang

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 rolltarball.sh | 106 ++++++++++++++++++++-------------------------------------
 1 file changed, 36 insertions(+), 70 deletions(-)

diff --git a/rolltarball.sh b/rolltarball.sh
index 456d3d5..8852ca2 100755
--- a/rolltarball.sh
+++ b/rolltarball.sh
@@ -22,14 +22,13 @@
 
 # Please increase version number before each commit which includes changes to
 # this script.
-MYVERSION='2.1'
+MYVERSION='2.2'
 
 # ********** Begin functions **********
 
 usage() {
 	
-	if [ -n "$1" ]
-	then
+	if [[ -n "$1" ]] ; then
 		eerror $1
 	else
 		cat <<-USAGE_HEADER
@@ -91,8 +90,7 @@ eerror() {
 
 
 die() {
-	if [ "$#" -gt 0 ]
-	then
+	if [[ "$#" -gt 0 ]] ; then
 		eerror ${*}
 	fi
 	exit 1
@@ -100,16 +98,14 @@ die() {
 
 
 einfo() {
-	if [ "${VERBOSE}" -ge "1" ]
-	then
+	if [[ "${VERBOSE}" -ge "1" ]] ; then
 		echo -e " ${GOOD}*${NORMAL} ${*}"
 	fi
 }
 
 
 ebegin() {
-	if [ "${VERBOSE}" -ge "1" ]
-	then
+	if [[ "${VERBOSE}" -ge "1" ]] ; then
 		echo -e " ${GOOD}*${NORMAL} ${*}..."
 	fi
 }
@@ -117,22 +113,18 @@ ebegin() {
 
 eend() {
 
-	if [ "$#" -eq 0 ] || ([ -n "$1" ] && [ "$1" -eq 0 ])
-	then
-		if [ "${VERBOSE}" -ge "1" ]
-		then
+	if [[ "$#" -eq 0 ]] || { [[ -n "$1" ]] && [[ "$1" -eq 0 ]] ; } ; then
+		if [[ "${VERBOSE}" -ge "1" ]] ;	then
 			echo -e "${ENDCOL}  ${BRACKET}[ ${GOOD}ok${BRACKET} ]${NORMAL}"
 		fi
 	else
 		retval=$1
 
-		if [ "$#" -ge 2 ]
-		then
+		if [[ "$#" -ge 2 ]] ; then
 			shift
 			eerror "${*}"
 		fi
-		if [ "${VERBOSE}" -ge "1" ]
-		then
+		if [[ "${VERBOSE}" -ge "1" ]] ;	then
 			echo -e "${ENDCOL}  ${BRACKET}[ ${BAD}!!${BRACKET} ]${NORMAL}"
 		fi	
 		return ${retval}
@@ -142,16 +134,14 @@ eend() {
 
 
 ewarn() {
-	if [ "${VERBOSE}" -ge "2" ]
-	then
+	if [[ "${VERBOSE}" -ge "2" ]] ;	then
 		echo -e " ${WARN}*${NORMAL} ${*}"
 	fi
 }
 
 
 edebug() {
-	if [ "${VERBOSE}" -ge "4" ]
-	then
+	if [[ "${VERBOSE}" -ge "4" ]] ;	then
 		echo -e " ${HILITE}*${NORMAL} ${*}"
 	fi
 }
@@ -202,22 +192,19 @@ UPLOAD_MIRROR=0
 VERBOSE=1
 
 # load configuration
-if [ -e ~/.apache-rolltarball ]
-then
+if [[ -e ~/.apache-rolltarball ]] ; then
 	. ~/.apache-rolltarball
 	edebug "Loaded configuration from ~/.apache-rolltarball"
 fi
 
-if [ "${COLOR}" -eq "0" ]
-then
+if [[ "${COLOR}" -eq "0" ]] ; then
 	nocolor;
 else
 	color;
 fi
 
 # Process command line
-until [ -z "$1" ]
-do
+until [[ -z "$1" ]] ; do
 	case "$1" in
 		--*)
 			# long options
@@ -233,7 +220,7 @@ do
 				no-copy)		COPYTO=;;
 				datestamp)		DATESTAMP=${VALUE};;
 				devspace)		UPLOAD_DEV=1;;
-				no-devspace)	UPLOAD_DEV=0;;
+				no-devspace)		UPLOAD_DEV=0;;
 				digest)			DIGEST=1;;
 				no-digest)		DIGEST=0;;
 				ebuild)			MOD_EBUILD=1;;
@@ -255,8 +242,7 @@ do
 			# short options
 			OPTLIST=${1/-/}
 			shift
-			while [ -n "${OPTLIST}" ]
-			do
+			while [[ -n "${OPTLIST}" ]] ; do
 				OPT=${OPTLIST:0:1}
 				OPTLIST=${OPTLIST#?}
 				case "${OPT}" in
@@ -287,8 +273,7 @@ do
 			done
 		;;
 		*)
-			if [ -n "${EBUILD}" ]
-			then
+			if [[ -n "${EBUILD}" ]] ; then
 				usage "Only one ebuild can be specified"
 			else
 				EBUILD=$1
@@ -298,33 +283,27 @@ do
 	esac
 done
 
-if [ -z "${EBUILD}" ]
-then
+if [[ -z "${EBUILD}" ]] ; then
 	usage "You must specify an ebuild"
 fi
 
-if [ "${EBUILD##*.}" != "ebuild" ]
-then
+if [[ "${EBUILD##*.}" != "ebuild" ]] ; then
 	usage "You must specify an ebuild"
 fi
 
-if [ ! -f ${EBUILD} ]
-then
+if [[ ! -f ${EBUILD} ]] ; then
 	die "Ebuild ${EBUILD} does not exist or is not a file"
 fi
 
-if [ "${VERBOSE}" -lt "0" ]
-then
+if [[ "${VERBOSE}" -lt "0" ]] ; then
 	VERBOSE=0
 fi
 
-if [ "${VERBOSE}" -gt "4" ]
-then
+if [[ "${VERBOSE}" -gt "4" ]] ; then
 	VERBOSE=4
 fi
 
-if [ "${VERBOSE}" -ge "3" ]
-then
+if [[ "${VERBOSE}" -ge "3" ]] ; then
 	edebug "Program output enabled"
 	exec 9>&1
 else
@@ -332,13 +311,11 @@ else
 	exec 9>/dev/null
 fi
 
-if [ "${ASK}" -eq "1" ]
-then
+if [[ "${ASK}" -eq "1" ]] ; then
 	PRETEND=1
 fi
 
-if [ -z "${G_USER}" ]
-then
+if [[ -z "${G_USER}" ]] ; then
 	G_USER="$(git log --pretty=fuller -1 | sed -n '/^Commit:/s&.*<\([[:alnum:]\._-]\+\)@.*>&\1&p')"
 	einfo "Detected Gentoo Developer: ${G_USER}"
 fi
@@ -363,8 +340,7 @@ git pull >&9
 eend $? "git update failed!" || die
 
 new_mtime=$(stat --format=%Y $0)
-if [ "${my_mtime}" -ne "${new_mtime}" ]
-then
+if [[ "${my_mtime}" -ne "${new_mtime}" ]] ; then
 	einfo "A new version of $0 is available"
 	einfo "Please restart $0"
 	die
@@ -406,8 +382,7 @@ edebug "  TB_DIR: ${TB_DIR}"
 
 # simply returns true or false based on whether we are in pretend mod or not
 pretend() {
-	if [ "${PRETEND}" -eq 1 ]
-	then
+	if [[ "${PRETEND}" -eq 1 ]] ; then
 		true
 		return $?
 	else
@@ -440,10 +415,8 @@ build_tarball() {
 		rm -rf ${TB_DIR} || ewarn "Couldn't clean up, manually remove ${TB_DIR}/"
 	}
 
-	if [ -n "${COPYTO}" ]
-	then
-		if [ -d ${COPYTO} -a -w ${COPYTO} ]
-		then
+	if [[ -n "${COPYTO}" ]] ; then
+		if [[ -d ${COPYTO} ]] && [[ -w ${COPYTO} ]] ; then
 			pretend && einfo "  Copy ${TB} to ${COPYTO}"
 			pretend || {
 				ebegin "Copying ${TB} to ${COPYTO}"
@@ -457,8 +430,7 @@ build_tarball() {
 		edebug "Copy not enabled"
 	fi
 
-	if [ "${UPLOAD_DEV}" -eq 1 ]
-	then
+	if [[ "${UPLOAD_DEV}" -eq 1 ]] ; then
 		pretend && einfo "  Upload ${TB} to"
 		pretend && einfo "      http://dev.gentoo.org/~${G_USER}/dist/apache/"
 		pretend || {
@@ -477,8 +449,7 @@ build_tarball() {
 		edebug "Upload to devspace not enabled"
 	fi
 
-	if [ "${UPLOAD_MIRROR}" -eq 1 ]
-	then
+	if [[ "${UPLOAD_MIRROR}" -eq 1 ]] ; then
 		pretend && einfo "  Upload ${TB} to mirror://gentoo/"
 		pretend || {
 			ebegin "Uploading ${TB} to mirror://gentoo/"
@@ -494,10 +465,8 @@ build_tarball() {
 		edebug "Upload to mirrors not enabled"
 	fi
 
-	if [ "${MOD_EBUILD}" -eq 1 ]
-	then
-		if [ -r ${EBUILD} ]
-		then
+	if [[ "${MOD_EBUILD}" -eq 1 ]] ; then
+		if [[ -r ${EBUILD} ]] ;	then
 			pretend && einfo "  Update GENTOO_PATCHSTAMP, GENTOO_DEVELOPER and GENTOO_PATCHNAME"
 			pretend || {
 				ebegin "Updating GENTOO_PATCHSTAMP, GENTOO_DEVELOPER and GENTOO_PATCHNAME"
@@ -517,8 +486,7 @@ build_tarball() {
 		edebug "Modify ebuild not enabled"
 	fi
 	
-	if [ "${DIGEST}" -eq 1 ]
-	then
+	if [[ "${DIGEST}" -eq 1 ]] ; then
 		pretend && einfo "  Regenerate digests"
 		pretend || {
 			ebegin "Regenerating digests"
@@ -530,13 +498,11 @@ build_tarball() {
 	fi
 	
 	pretend && einfo "No actions actually taken"
-	if [ "${ASK}" -eq 1 ]
-	then
+	if [[ "${ASK}" -eq 1 ]] ; then
 		einfo "Would you like to perform the above actions?"
 		echo -n "Type 'Yes' or 'No'> "
 		read ask_in
-		if [ "${ask_in}" == "Yes" -o "${ask_in}" == "yes" ]
-		then
+		if [[ "${ask_in}" == [Yy]es ]] ; then
 			ASK=0
 			PRETEND=0
 			build_tarball

[gentoo-commits] proj/apache:master commit in: /

[Hans de Graaff]

commit:     aa8fa1e9d34de8f60e04b2ef47c34e90714b48ac
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 08:02:16 2023 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 08:10:46 2023 +0000
URL:        https://gitweb.gentoo.org/proj/apache.git/commit/?id=aa8fa1e9

Show https URLs for dev.gentoo.org

These URLs are only for display purposes, but still more sensible to
show https URLs.

Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 rolltarball.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rolltarball.sh b/rolltarball.sh
index 8852ca2..e2ef6d7 100755
--- a/rolltarball.sh
+++ b/rolltarball.sh
@@ -432,10 +432,10 @@ build_tarball() {
 
 	if [[ "${UPLOAD_DEV}" -eq 1 ]] ; then
 		pretend && einfo "  Upload ${TB} to"
-		pretend && einfo "      http://dev.gentoo.org/~${G_USER}/dist/apache/"
+		pretend && einfo "      https://dev.gentoo.org/~${G_USER}/dist/apache/"
 		pretend || {
 			einfo "Uploading ${TB} to"
-			ebegin "    http://dev.gentoo.org/~${G_USER}/dist/apache/"
+			ebegin "    https://dev.gentoo.org/~${G_USER}/dist/apache/"
 			edebug "Making directories on dev.gentoo.org: ~/public_html/dist/apache"
 			ssh ${G_USER}@dev.gentoo.org 'mkdir -pm 0755 ~/public_html/dist/apache/' >&9 || eend $? "Failed to make directories" || die