upgpkg: servo-git r44209.052278d058-1

Backup files installed in etc profile

2 files changed, 12 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 72430f8ffd98..709f348e81a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -35,6 +35,8 @@ pkgbase = servo-git
 	depends = xcb-util
 	provides = servo
 	conflicts = servo
+	backup = etc/profile.d/servo.csh
+	backup = etc/profile.d/servo.sh
 	source = servo-git::git+https://github.com/servo/servo.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 62b11bf947df..0c4c87a3ae45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -41,6 +41,7 @@ makedepends=(autoconf2.13
              rust-nightly)
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
+backup=("etc/profile.d/${pkgname%-git}".{csh,sh})
 source=("$pkgname::git+$url.git")
 sha256sums=('SKIP')
 
@@ -49,6 +50,12 @@ pkgver() {
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+	cd "$pkgname"
+	echo 'export PATH=$PATH:/opt/servo' > "${pkgname%-git}.sh"
+	echo 'setenv PATH ${PATH}:/opt/servo' > "${pkgname%-git}.csh"
+}
+
 build() {
 	cd "$pkgname"
 	# fixes build error
@@ -59,7 +66,7 @@ build() {
 
 package() {
 	servopath=$pkgname/target/release
-	install -Dm755 "$servopath/servo" "$pkgdir/opt/servo/servo"
+	install -Dm0755 -t "$pkgdir/opt/servo/" "$servopath/servo"
 	if [ "$_install_libs" = true ] ; then
 		mkdir -p "$pkgdir/usr/lib"
 		find "$servopath/deps" -name "*-*.so" -exec basename {} \; | sort | uniq | while read _f; do
@@ -73,8 +80,6 @@ package() {
 	fi
 	mkdir -p "$pkgdir/opt/servo/resources"
 	cp -r $pkgname/resources/* "$pkgdir/opt/servo/resources"
-	mkdir -p "$pkgdir/etc/profile.d"
-	echo 'export PATH=$PATH:/opt/servo' > "$pkgdir/etc/profile.d/${pkgname%-git}.sh"
-	echo 'setenv PATH ${PATH}:/opt/servo' > "$pkgdir/etc/profile.d/${pkgname%-git}.csh"
-	chmod 755 "$pkgdir/etc/profile.d/${pkgname%-git}".{csh,sh}
+	cd "$pkgname"
+	install -Dm0755 -t "$pkgdir/etc/profile.d/" "${pkgname%-git}".{csh,sh}
 }