Browse Source

make package-add location independent

Nathaniel van Diepen 10 years ago
parent
commit
6df2d95630
1 changed files with 11 additions and 10 deletions
  1. 11 10
      bin/package-add

+ 11 - 10
bin/package-add

@@ -1,13 +1,14 @@
 #!/bin/bash
+root="$(readlink -f $(dirname $BASH_SOURCE)/..)";
 if [[ "$1" != "" ]];then
 	btype="";
 	script="";
 	if [[ "$2" != "" ]];then
-		mkdir -p src/$1;
-		ln -s `readlink -f $2`  src/$1/source;
+		mkdir -p $root/src/$1;
+		ln -s `readlink -f $2`  $root/src/$1/source;
 		echo "Linked source in $2";
 	else
-		mkdir -p src/$1/source;
+		mkdir -p $root/src/$1/source;
 	fi;
 	echo -e "Type:\n (1) script\n (2) git\n (3) svn";
 	while [[ ! $btype =~ ^1|2|3$ ]]; do
@@ -25,22 +26,22 @@ if [[ "$1" != "" ]];then
 			read -p "Script path: " script;
 		;;
 	esac;
-	if [[ ! -f src/$1/PKGBUILD ]];then
-		cp etc/PKGBUILD.in src/$1/PKGBUILD;
+	if [[ ! -f $root/src/$1/PKGBUILD ]];then
+		cp $root/etc/PKGBUILD.in $root/src/$1/PKGBUILD;
 		case $btype in
 			git)
-				echo -e "pkgver=0.0.0\npkgver() {\n\tcd \"\${srcdir%/*}/source\"\n\tif git describe --tags > /dev/null 2>&1;then\n\t\tgit describe --tags --long | sed -E 's/([^-]*-g)/r\1/;s/-/./g';\n\telse\n\t\tdate +%Y%m%d;\n\tfi;}"|cat - src/$1/PKGBUILD > /tmp/out && mv /tmp/out src/$1/PKGBUILD;
+				echo -e "pkgver=0.0.0\npkgver() {\n\tcd \"\${srcdir%/*}/source\"\n\tif git describe --tags > /dev/null 2>&1;then\n\t\tgit describe --tags --long | sed -E 's/([^-]*-g)/r\1/;s/-/./g';\n\telse\n\t\tdate +%Y%m%d;\n\tfi;}"|cat - $root/src/$1/PKGBUILD > /tmp/out && mv /tmp/out $root/src/$1/PKGBUILD;
 			;;
 			svn)
-				echo -e "pkgver=0.0.0\npkgver() {\n\tcd \"\${srcdir%/*}/source\"\n\tlocal ver=\"\$(svnversion)\"\n\tprintf \"r%s\" \"\${ver//[[:alpha:]]}\"\n}"|cat - src/$1/PKGBUILD > /tmp/out && mv /tmp/out src/$1/PKGBUILD;
+				echo -e "pkgver=0.0.0\npkgver() {\n\tcd \"\${srcdir%/*}/source\"\n\tlocal ver=\"\$(svnversion)\"\n\tprintf \"r%s\" \"\${ver//[[:alpha:]]}\"\n}"|cat - $root/src/$1/PKGBUILD > /tmp/out && mv /tmp/out $root/src/$1/PKGBUILD;
 			;;
 			script)
-				echo -e "pkgver=0.0.0\npkgver() {\n  date +%Y%m%d\n}"|cat - src/$1/PKGBUILD > /tmp/out && mv /tmp/out src/$1/PKGBUILD;
+				echo -e "pkgver=0.0.0\npkgver() {\n  date +%Y%m%d\n}"|cat - $root/src/$1/PKGBUILD > /tmp/out && mv /tmp/out $root/src/$1/PKGBUILD;
 			;;
 		esac;
-		echo -e "pkgname=$1\n"|cat - src/$1/PKGBUILD > /tmp/out && mv /tmp/out src/$1/PKGBUILD;
+		echo -e "pkgname=$1\n"|cat - $root/src/$1/PKGBUILD > /tmp/out && mv /tmp/out $root/src/$1/PKGBUILD;
 	fi;
-	file=`dirname $BASH_SOURCE`/../etc/packages.d/$1;
+	file=$root/etc/packages.d/$1;
 	touch $file;
 	echo "packages+=(\"[name]='$1' [type]='$btype' [script]='$script'\")" > $file;
 	echo "Created package $1";