Possibility to use MAKEPKG as an environment variable or in yaourtrc …

…to set another 'makepkg' executable

src/lib/pkgbuild.sh.in

@@ -56,7 +56,7 @@ read_pkgbuild() {
 	echo "}"                                        >> $pkgbuild_tmp
 	echo "( yaourt_$$ ) || exit 1"                  >> $pkgbuild_tmp
 	echo "exit 0"                                   >> $pkgbuild_tmp
-	PKGBUILD_VARS="$(makepkg "${MAKEPKG_ARG[@]}" -p "$pkgbuild_tmp" 3>&1 1>/dev/null | tr '\n' ';')"
+	PKGBUILD_VARS="$(y_makepkg -p "$pkgbuild_tmp" 3>&1 1>/dev/null | tr '\n' ';')"
 	rm "$pkgbuild_tmp"
 	eval $PKGBUILD_VARS
 	pkgbase=${pkgbase:-${pkgname[0]}}
@@ -207,7 +207,7 @@ build_package() {
 		fi
 		if (( SYSUPGRADE )) && (( DEVEL )) && (( ! FORCE )); then
 			if ((YPKGVER_FUNC)); then
-				SRCDEST="$YSRCDEST" makepkg "${MAKEPKG_ARG[@]}" -o -p ./PKGBUILD
+				SRCDEST="$YSRCDEST" y_makepkg -o -p ./PKGBUILD
 				# re-read PKGBUILD to update version
 				read_pkgbuild || return 1
 				eval $PKGBUILD_VARS
@@ -237,13 +237,13 @@ build_package() {
 	fi
 
 	# Build 
-	SRCDEST="$YSRCDEST" PKGDEST="$YPKGDEST" makepkg "${MAKEPKG_ARG[@]}" -s -f -p ./PKGBUILD
+	SRCDEST="$YSRCDEST" PKGDEST="$YPKGDEST" y_makepkg -s -f -p ./PKGBUILD
 
 	if (( $? )); then
 		error $(_gettext 'Makepkg was unable to build %s.' "$pkgbase")
 		return 1
 	fi
-	(( EXPORT && EXPORTSRC )) && [[ $SRCPKGDEST ]] && SRCDEST="$YSRCDEST" makepkg --allsource -p ./PKGBUILD
+	(( EXPORT && EXPORTSRC )) && [[ $SRCPKGDEST ]] && SRCDEST="$YSRCDEST" y_makepkg --allsource -p ./PKGBUILD
 	return 0
 }
 
@@ -412,12 +412,6 @@ get_pkgbuild() {
 	cd "$cwd"
 }
 
-# makepkg check root
-if (( ! UID )); then
-	warning $(gettext 'makepkg dropped --asroot support, please run yaourt as a non-privileged user.')
-	exit 1
-fi
-
 # If we have to deal with PKGBUILD and makepkg, source makepkg conf(s)
 source_makepkg_conf
 

src/lib/util.sh.in

@@ -164,6 +164,7 @@ program_arg() {
 pacman_parse() { LC_ALL=C pacman --color never "${PACMAN_C_ARG[@]}" "$@"; }
 pacman_out()   { $PACMAN "${PACMAN_C_ARG[@]}" "${PACMAN_O_ARG[@]}" "$@"; }
 pkgquery()     { package-query "${PKGQUERY_C_ARG[@]}" "$@"; }
+y_makepkg() { $MAKEPKG "${MAKEPKG_ARG[@]}" "$@"; }
 curl_fetch()   { curl "${CURL_C_ARG[@]}" "$@"; }
 
 # Run editor
@@ -250,6 +251,7 @@ TMPDIR=${TMPDIR:-/tmp}
 check_dir TMPDIR || die 1
 YAOURTTMPDIR="$TMPDIR/yaourt-tmp-$(id -un)"
 export PACMAN=${PACMAN:-pacman}
+export MAKEPKG=${MAKEPKG:-makepkg}
 # Add --aur-url option to package-query args
 program_arg $A_PKC --aur-url "$AURURL"
 

src/yaourtrc.in

@@ -55,6 +55,7 @@
 
 # Command
 #PACMAN="pacman"
+#MAKEPKG="makepkg"
 #DIFFEDITCMD="vimdiff"
 
 # pacdiffviewer