Browse Source

package-add updates, template updates

Eeems 10 years ago
parent
commit
f25030b1ce
5 changed files with 41 additions and 5 deletions
  1. 9 4
      bin/package-add
  2. 5 1
      bin/repo-build
  3. 13 0
      etc/PKGBUILD.in
  4. 10 0
      etc/build.sh.in
  5. 4 0
      repo/updates/.gitignore

+ 9 - 4
bin/package-add

@@ -4,14 +4,19 @@ if [[ "$1" != "" ]];then
 	script="";
 	if [[ "$2" != "" ]];then
 		mkdir -p src/$1;
-		ln -s `readlink -f $2`  src/$1/src;
+		ln -s `readlink -f $2`  src/$1/source;
 		echo "Linked source in $2";
 	else
-		mkdir -p src/$1/src;
+		mkdir -p src/$1/source;
+	fi;
+	mkdir -p src/$1/pkg
+	mkdir -p src/$1/src
+	if [[ ! -f src/$1/PKGBUILD ]];then
+		cp etc/PKGBUILD.in src/$1/PKGBUILD;
+		echo -e "pkgname=$1\n"|cat - src/$1/PKGBUILD > /tmp/out && mv /tmp/out src/$1/PKGBUILD;
 	fi;
 	if [[ ! -f src/$1/build.sh ]];then
-		touch src/$1/build.sh;
-		echo "#!/bin/bash\\necho -e \"\\tBuilt.\"" > src/$1/build.sh;
+		cp etc/build.sh.in src/$1/build.sh
 	fi;
 	chmod +x src/$1/build.sh
 	echo -e "Type:\n (1) script\n (2) git\n (3) svn";

+ 5 - 1
bin/repo-build

@@ -13,10 +13,11 @@ for val in "${packages[@]}"; do
 	name=${package[name]};
 	echo "Checking $name";
 	echo -e "\tChecking for updates";
-	cd $root/src/$name/src;
+	cd $root/src/$name/source;
 	case ${package[type]} in
 		git)
 			git reset --hard > /dev/null;
+			git clean -f -d > /dev/null;
 			expect -c "
 				set timeout 1
 				log_user 0
@@ -72,6 +73,9 @@ for val in "${packages[@]}"; do
 	if ! ls $name-*-i686.pkg.tar.xz &> /dev/null ||  $build || $override;then
 		echo -e "\tBuilding";
 		./build.sh
+		ls $name-*-i686.pkg.tar.xz | while read item; do
+			cp $item $root/repo/updates/$item;
+		done;
 	fi;
 	echo -e "\tDone"
 done;

+ 13 - 0
etc/PKGBUILD.in

@@ -0,0 +1,13 @@
+pkgver=
+pkgrel=
+pkgdesc=
+pkgdir=pkg
+arch=('x86_64' 'i686')
+source="$pkgname.tar.gz"
+build() {
+	make 
+}
+package() {
+	make DESTDIR="${pkgdir}" install
+}
+md5sums=

+ 10 - 0
etc/build.sh.in

@@ -0,0 +1,10 @@
+#!/bin/bash
+name=$(basename $(pwd));
+pwd=$(pwd);
+pushd $pwd;
+cd source;
+tar -zcvf $pwd/$name.tar.gz *;
+popd;
+updpkgsums;
+makepkg -f;
+echo -e "\tBuilt.";

+ 4 - 0
repo/updates/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore