Commit b06b9f60 authored by Pierre Schmitz's avatar Pierre Schmitz
Browse files

Merge remote-tracking branch 'cryptocrack/for-pierre'

parents 9715ddbe a0c6bf45

.gitignore

+13 −0
Original line number Diff line number Diff line 
*~

devtools-*.tar.gz

archbuild

archco

archrelease

archrm

bash_completion

checkpkg

commitpkg

finddeps

lddd

makechrootpkg

mkarchroot

rebuildpkgs

zsh_completion

Makefile

+11 −2
Original line number Diff line number Diff line
@@ -47,7 +47,16 @@ ARCHBUILD_LINKS = \ 
	multilib-build \

	multilib-testing-build



all:

all: $(BINPROGS) $(SBINPROGS) bash_completion zsh_completion



%: %.in

	@echo "GEN $@"

	@sed -e "s|@pkgdatadir[@]|$(DESTDIR)$(PREFIX)/share/devtools|g" "$<" >"$@"

	@chmod a-w "$@"

	@chmod +x "$@"



clean:

	rm -f $(BINPROGS) $(SBINPROGS) bash_completion zsh_completion



install:

	install -dm0755 $(DESTDIR)$(PREFIX)/bin
@@ -78,4 +87,4 @@ dist: 
upload:

	scp devtools-$(V).tar.gz gerolde.archlinux.org:/srv/ftp/other/devtools/



.PHONY: all install uninstall dist upload
 
.PHONY: all clean install uninstall dist upload

archbuild→archbuild.in

100755 → 100644
+2 −2
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then 
	rm -rf "${chroots}/${repo}-${arch}"

	mkdir -p "${chroots}/${repo}-${arch}"

	setarch "${arch}" mkarchroot \

		-C "/usr/share/devtools/pacman-${repo}.conf" \

		-M "/usr/share/devtools/makepkg-${arch}.conf" \

		-C "@pkgdatadir@/pacman-${repo}.conf" \

		-M "@pkgdatadir@/makepkg-${arch}.conf" \

		"${chroots}/${repo}-${arch}/root" \

		"${base_packages[@]}"

else

archco→archco.in

100755 → 100644
+0 −0

File moved.File mode changed from 100755 to 100644.

View file

archrelease→archrelease.in

100755 → 100644
+3 −4
Original line number Diff line number Diff line
@@ -46,15 +46,14 @@ for tag in "$@"; do 
		while read -r file; do

			trash+=("repos/$tag/$file")

		done < <(svn ls "repos/$tag")

		svn rm -q "${trash[@]}"

		[[ $trash ]] && svn rm -q "${trash[@]}"

	else

		mkdir -p "repos/$tag"

		svn add --parents -q "repos/$tag"

	fi



	for file in "${known_files[@]}"; do

		svn copy -q -r HEAD "$trunk/$file" "repos/$tag/"

	done

	# copy all files at once from trunk to the subdirectory in repos/

	svn copy -q -r HEAD ${known_files[@]/#/$trunk/} "repos/$tag/"



	echo 'done'

done