Merge pull request #474 from dscho/drop-obsolete-please.sh-sync

please.sh: drop the obsolete `sync` command

Author: dscho

please.sh

@@ -181,170 +181,6 @@ process_keep_despite_upgrade () { # [--keep] <sdk-path>
 	rm -rf "$1/.keep"
 }
 
-sync () { # [--force]
-	force=
-	y_opt=y
-	only=
-	while case "$1" in
-	--force)
-		force='--overwrite=\*'
-		y_opt=yy
-		;;
-	--only-i686|--only-32-bit)
-		only="$sdk32"
-		;;
-	--only-x86_64|--only-64-bit)
-		only="$sdk64"
-		;;
-	-*) die "Unknown option: %s\n" "$1";;
-	*) break;;
-	esac; do shift; done
-	test $# = 0 ||
-	die "Expected no argument, got $#: %s\n" "$*"
-
-	export MSYSTEM=msys
-	export MSYS2_PATH_TYPE=minimal
-	for sdk in "$sdk32" "$sdk64"
-	do
-		test -z "$only" ||
-		test "$only" = "$sdk" ||
-		continue
-
-		case "$sdk" in
-			"$sdk32")
-				PACMAN_ARCH=i686
-				;;
-			"$sdk64")
-				PACMAN_ARCH=x86_64
-				;;
-			*)
-				die "Invalid SDK $sdk"
-				;;
-		esac
-
-		mkdir -p "$sdk/var/log" ||
-		die "Could not ensure %s/var/log/ exists\n" "$sdk"
-
-		remove_obsolete_packages ||
-		die "Could not remove obsolete packages\n"
-
-		"$sdk/git-cmd.exe" --command=usr\\bin\\bash.exe -lc \
-			"for key in 4A6129F4E4B84AE46ED7F635628F528CF3053E04 \
-				5F944B027F7FE2091985AA2EFA11531AA0AA7F57
-			 do
-				pacman-key --list-keys \$key >/dev/null 2>&1 || {
-					pacman-key --recv-keys \$key &&
-					pacman-key --lsign-key \$key;
-				} || exit 1
-			 done
-			 pacman.exe -S$y_opt" ||
-		die "Cannot run pacman in %s\n" "$sdk"
-
-		prepare_keep_despite_upgrade "$sdk" ||
-		die 'Could not keep files as planned\n'
-
-		"$sdk/git-cmd.exe" --cd="$sdk" --command=usr\\bin\\bash.exe \
-			-lc 'pacman.exe -Su '$force' --noconfirm' ||
-		die "Could not update packages in %s\n" "$sdk"
-
-		"$sdk/git-cmd.exe" --command=usr\\bin\\bash.exe -l -c '
-			pacman-key --list-keys BB3AA74136C569BB >/dev/null ||
-			pacman-key --populate git-for-windows' ||
-		die "Could not re-populate git-for-windows-keyring\n"
-
-		process_keep_despite_upgrade --keep "$sdk" ||
-		die 'Could not copy back files-to-keep\n'
-
-		case "$(tail -c 16384 "$sdk/var/log/pacman.log" |
-			grep '\[PACMAN\] starting .* system upgrade' |
-			tail -n 1)" in
-		*"full system upgrade")
-			;; # okay
-		*)
-			# only "core" packages were updated, update again
-			"$sdk/git-cmd.exe" --cd="$sdk" \
-				--command=usr\\bin\\bash.exe -l \
-				-c 'pacman -Su '$force' --noconfirm' ||
-			die "Cannot update packages in %s\n" "$sdk"
-
-			process_keep_despite_upgrade --keep "$sdk" ||
-			die 'Could not copy back files-to-keep\n'
-
-			"$sdk/git-cmd.exe" --command=usr\\bin\\bash.exe -l -c '
-				pacman-key --list-keys BB3AA74136C569BB \
-					>/dev/null ||
-				pacman-key --populate git-for-windows' ||
-			die "Could not re-populate git-for-windows-keyring\n"
-			;;
-		esac
-
-		process_keep_despite_upgrade "$sdk" ||
-		die 'Could not copy back files-to-keep\n'
-
-		# A ruby upgrade (or something else) may require a re-install
-		# of the `asciidoctor` gem. We only do this for the 64-bit
-		# SDK, though, as we require asciidoctor only when building
-		# Git, whose 32-bit packages are cross-compiled in from 64-bit.
-		test "$sdk64" != "$sdk" ||
-		"$sdk/git-cmd.exe" --command=usr\\bin\\bash.exe -l -c \
-			'test -n "$(gem list --local | grep "^asciidoctor ")" ||
-			 gem install asciidoctor || exit;
-			 export PATH=/mingw32/bin:$PATH;
-			 test -n "$(gem list --local | grep "^asciidoctor ")" ||
-			 gem install asciidoctor' ||
-		die "Could not re-install asciidoctor in %s\n" "$sdk"
-
-		# mingw-w64-git-extra rewrites some files owned by other packages,
-		# therefore it has to be (re-)installed now
-		"$sdk/git-cmd.exe" --command=usr\\bin\\bash.exe -l -c \
-			'pacman -S '$force' --noconfirm mingw-w64-'$PACMAN_ARCH'-git-extra' ||
-		die "Cannot update mingw-w64-'$PACMAN_ARCH'-git-extra in %s\n" "$sdk"
-
-		pacnew="$(sed -ne '/starting core system upgrade/{
-			:1;
-			s/.*/WAIT/;x
-			:2;
-			n;
-			/warning:.*installed as .*\.pacnew$/{s/.* as //;H;b2}
-			/starting full system upgrade/{x;s/WAIT//;x;b2}
-			/starting core system upgrade/{x;/WAIT/{x;b2};b1}
-			${x;s/WAIT//;s/^\n//;/./p}
-			b2;
-			}' <"$sdk"/var/log/pacman.log)" ||
-		die "Could not get list of .pacnew files\n"
-		if test -n "$pacnew"
-		then
-			# Make sure we have the mingw-w64-git-extra package locally, as
-			# one of the .pacnew files could be pacman.conf, and
-			# replacing it removes the link to Git for Windows'
-			# Pacman repository
-			"$sdk/git-cmd.exe" --command=usr\\bin\\bash.exe -l -c \
-			   'pkg=/var/cache/pacman/pkg/$(pacman -Q mingw-w64-'$PACMAN_ARCH'-git-extra |
-				tr \  -)*.pkg.tar.xz
-			    test -f $pkg || {
-				pacman -Sw --noconfirm mingw-w64-'$PACMAN_ARCH'-git-extra &&
-				test -f $pkg || {
-					echo "Could not cache $pkg" >&2
-					exit 1
-				}
-			    }
-			    for f in '"$(echo "$pacnew" | tr '\n' ' ')"'
-			    do
-				test ! -f $f ||
-				mv -f $f ${f%.pacnew} || {
-					echo "Could not rename $f" >&2
-					exit 1
-				}
-			    done
-			    pacman -U --noconfirm '$force' $pkg || {
-				echo "Could not reinstall $pkg" >&2
-				exit 1
-			    }' ||
-			die "Could not handle .pacnew files\n"
-		fi
-	done
-}
-
 mount_sdks () { #
 	test -d /sdk32 || mount "$sdk32" /sdk32
 	test -d /sdk64 || mount "$sdk64" /sdk64
@@ -583,20 +419,6 @@ ff_main_branch () {
 	die "%s: cannot fast-forward main branch\n" "$sdk$pkgpath"
 }
 
-remove_obsolete_packages () {
-	test "a$sdk" = "a$sdk32" &&
-	arch=i686 ||
-	arch=x86_64
-
-	for p in mingw-w64-$arch-curl-winssl-bin
-	do
-		test ! -d "$sdk"/var/lib/pacman/local/$p-[0-9]* ||
-		"$sdk"/git-cmd.exe --command=usr\\bin\\pacman.exe \
-			-R --noconfirm $p ||
-		die "Could not remove %s\n" "$p"
-	done
-}
-
 # require <metapackage> <telltale>
 require () {
 	test -d "$sdk"/var/lib/pacman/local/"${2:-$1}"-[0-9]* ||