diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh index b93cda0bf2..ac2dffcfe2 100644 --- a/packaging/linux/buildpackage.sh +++ b/packaging/linux/buildpackage.sh @@ -44,7 +44,7 @@ cp -r hicolor root/usr/share/icons/ ( echo "Building Arch-Linux package." cd pkgbuild - sh buildpackage.sh "$VERSION" "$PACKAGEDIR" &> package.log + sh buildpackage.sh "$VERSION" ../root "$PACKAGEDIR" &> package.log if [ $? -ne 0 ]; then echo "Arch-Linux package build failed, refer to $PWD/package.log." fi diff --git a/packaging/linux/pkgbuild/PKGBUILD b/packaging/linux/pkgbuild/PKGBUILD index e13cdd53c0..ed57f0cc66 100644 --- a/packaging/linux/pkgbuild/PKGBUILD +++ b/packaging/linux/pkgbuild/PKGBUILD @@ -21,5 +21,5 @@ noextract=() md5sums=() build() { - cp -r ~/openra-package/built/usr/ $pkgdir/ + cp -r {ROOT}/usr/ $pkgdir/ } diff --git a/packaging/linux/pkgbuild/buildpackage.sh b/packaging/linux/pkgbuild/buildpackage.sh index e9dcc86ceb..e0b48d8d79 100644 --- a/packaging/linux/pkgbuild/buildpackage.sh +++ b/packaging/linux/pkgbuild/buildpackage.sh @@ -1,17 +1,18 @@ #!/bin/bash E_BADARGS=85 -if [ $# -ne "2" ] +if [ $# -ne "3" ] then - echo "Usage: `basename $0` version outputdir" + echo "Usage: `basename $0` version root-dir outputdir" exit $E_BADARGS fi PKGVERSION=`echo $1 | sed "s/-/\\./g"` sed -i "s/{VERSION}/$PKGVERSION/" PKGBUILD +sed -i "s/{ROOT}/$2/" PKGBUILD makepkg --holdver if [ $? -ne 0 ]; then exit 1 fi -mv openra-$PKGVERSION-1-any.pkg.tar.xz $2 \ No newline at end of file +mv openra-$PKGVERSION-1-any.pkg.tar.xz $3 \ No newline at end of file