Code cleanup of publish scripts (#530)

Author: basil

deb/publish/publish.sh

@@ -23,7 +23,7 @@ function generateSite() {
 	cp -R "$bin/contents/." "$D/contents"
 
 	gpg --export -a --output "$D/contents/${ORGANIZATION}.key" "${GPG_KEYNAME}"
-	echo "$(gpg --import-options show-only --import $D/contents/${ORGANIZATION}.key)" >"$D/contents/${ORGANIZATION}.key.info"
+	gpg --import-options show-only --import "$D/contents/${ORGANIZATION}.key" >"$D/contents/${ORGANIZATION}.key.info"
 
 	"$BASE/bin/indexGenerator.py" \
 		--distribution debian \
@@ -43,13 +43,13 @@ function generateSite() {
 
 	# Remote ftparchive-merge
 	# https://github.com/kohsuke/apt-ftparchive-merge
-	pushd $D/binary
+	pushd "$D/binary"
 	mvn -V org.kohsuke:apt-ftparchive-merge:1.6:merge -Durl="$DEB_URL/binary/" -Dout=../merged
 	popd
 
 	# Local ftparchive-merge
 
-	cat $D/merged/Packages >$D/binary/Packages
+	cat "$D/merged/Packages" >"$D/binary/Packages"
 	gzip -9c "$D/merged/Packages" >"$D/binary/Packages.gz"
 	bzip2 -c "$D/merged/Packages" >"$D/binary/Packages.bz2"
 	lzma -c "$D/merged/Packages" >"$D/binary/Packages.lzma"
@@ -69,7 +69,7 @@ function init() {
 }
 
 function skipIfAlreadyPublished() {
-	if test -e "${DEBDIR}/$(basename "$DEB")"; then
+	if [[ -f "${DEBDIR}/$(basename "$DEB")" ]]; then
 		echo "File already published, nothing else todo"
 		return 0
 	fi

msi/publish/publish.sh

@@ -21,13 +21,13 @@ function generateSite() {
 }
 
 function init() {
-	mkdir -p $D
+	mkdir -p "$D"
 
 	mkdir -p "${MSIDIR}/${VERSION}/"
 }
 
 function skipIfAlreadyPublished() {
-	if test -e "${MSIDIR}/${VERSION}/$(basename "$MSI")"; then
+	if [[ -f "${MSIDIR}/${VERSION}/$(basename "$MSI")" ]]; then
 		echo "File already published, nothing else todo"
 		exit 0
 

rpm/publish/publish.sh

@@ -16,12 +16,12 @@ D="$AGENT_WORKDIR/$$"
 SSH_OPTS=($SSH_OPTS)
 
 function clean() {
-	rm -rf $D
+	rm -rf "$D"
 }
 
 function generateSite() {
 	gpg --export -a --output "$D/${ORGANIZATION}.key" "${GPG_KEYNAME}"
-	echo "$(gpg --import-options show-only --import $D/${ORGANIZATION}.key)" >"$D/${ORGANIZATION}.key.info"
+	gpg --import-options show-only --import "$D/${ORGANIZATION}.key" >"$D/${ORGANIZATION}.key.info"
 
 	"$BASE/bin/indexGenerator.py" \
 		--distribution redhat \

suse/publish/publish.sh

@@ -16,7 +16,7 @@ SSH_OPTS=($SSH_OPTS)
 SCP_OPTS=($SCP_OPTS)
 
 function clean() {
-	rm -rf $D
+	rm -rf "$D"
 }
 
 function generateSite() {
@@ -26,9 +26,9 @@ function generateSite() {
 
 	gpg --export -a --output "$D/repodata/repomd.xml.key" "${GPG_KEYNAME}"
 
-	"$BASE/bin/branding.py" $D
+	"$BASE/bin/branding.py" "$D"
 
-	cp "$SUSE" $D/RPMS/noarch
+	cp "$SUSE" "$D/RPMS/noarch"
 }
 
 function init() {
@@ -41,7 +41,7 @@ function init() {
 	# where to put repository index and other web contents
 	mkdir -p "$SUSE_WEBDIR"
 
-	mkdir -p $D/RPMS/noarch $D/repodata
+	mkdir -p "$D/RPMS/noarch" "$D/repodata"
 }
 
 function skipIfAlreadyPublished() {
@@ -85,7 +85,7 @@ function uploadPackage() {
 }
 
 function uploadSite() {
-	pushd $D
+	pushd "$D"
 	rsync \
 		--recursive \
 		--times \

war/publish/publish.sh

@@ -21,13 +21,13 @@ function generateSite() {
 }
 
 function init() {
-	mkdir -p $D
+	mkdir -p "$D"
 
 	mkdir -p "${WARDIR}/${VERSION}/"
 }
 
 function skipIfAlreadyPublished() {
-	if test -e "${WARDIR}/${VERSION}/${ARTIFACTNAME}.war"; then
+	if [[ -f "${WARDIR}/${VERSION}/${ARTIFACTNAME}.war" ]]; then
 		echo "File already published, nothing else todo"
 		exit 0
 	fi