summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Davis <jrcd83@gmail.com>2012-04-16 01:03:20 +0200
committerJustin Davis <jrcd83@gmail.com>2012-04-16 01:03:20 +0200
commit690e3e9a39e2691b483474725ee1a17d44231401 (patch)
tree9919cf2319fa08b8392659b63465c5c1434357c6
parent10ef1c3abeb88af473c34f8ddd18da3148796823 (diff)
downloadgenpkg-690e3e9a39e2691b483474725ee1a17d44231401.tar.gz
genpkg-690e3e9a39e2691b483474725ee1a17d44231401.tar.xz
Rename the metas/ directory to preps/.
This matches the prepkg script name.
-rwxr-xr-xbin/genpkg6
-rwxr-xr-xpreps/perl (renamed from metas/perl)2
-rwxr-xr-xpreps/perl.d/fetchcpan (renamed from metas/perl.d/fetchcpan)0
-rwxr-xr-xpreps/perl.d/perl-dist (renamed from metas/perl.d/perl-dist)2
-rwxr-xr-xpreps/perl.d/perl-pkgbuild (renamed from metas/perl.d/perl-pkgbuild)0
-rwxr-xr-xpreps/perl.d/scrapecore (renamed from metas/perl.d/scrapecore)0
-rwxr-xr-xsetup8
7 files changed, 9 insertions, 9 deletions
diff --git a/bin/genpkg b/bin/genpkg
index 7d8e222..ee8abd3 100755
--- a/bin/genpkg
+++ b/bin/genpkg
@@ -2,7 +2,7 @@
prog=genpkg
-metad=~/.genpkg/metas
+prepd=~/.genpkg/preps
templd=~/.genpkg/templ
tweakd=~/pkg/tweaks
pkgd=~/pkg/dest
@@ -80,7 +80,7 @@ do
mkdir PKGTREE
trap 'rm -f PKGDATA' 1 2 15
- if METABIN="$metad" PKGVAR="$vard" prepkg "$pkg" > PKGDATA
+ if METABIN="$prepd" PKGVAR="$vard" prepkg "$pkg" > PKGDATA
then
echo "$pkgd/$pkg"
else
@@ -88,7 +88,7 @@ do
exit "$?"
fi
- #twk="$tweakd/$pkg"
+ #mod="$tweakd/$pkg"
#if [ -f "$twk" -a -r "$twk" ] && modmetapkg
#then
# echo "Modified metapackage." 1>&2
diff --git a/metas/perl b/preps/perl
index 23f4907..9f8bb35 100755
--- a/metas/perl
+++ b/preps/perl
@@ -7,7 +7,7 @@ use File::Fetch;
use IO::Handle; # for autoflush
use Cwd;
-my $PROG = 'metas/perl';
+my $PROG = 'preps/perl';
my %BADNAMES = ('perl-libwww' => 'libwww-perl');
sub err
diff --git a/metas/perl.d/fetchcpan b/preps/perl.d/fetchcpan
index 076599b..076599b 100755
--- a/metas/perl.d/fetchcpan
+++ b/preps/perl.d/fetchcpan
diff --git a/metas/perl.d/perl-dist b/preps/perl.d/perl-dist
index b1eedf2..407403d 100755
--- a/metas/perl.d/perl-dist
+++ b/preps/perl.d/perl-dist
@@ -3,7 +3,7 @@
use warnings 'FATAL' => 'all';
use strict;
-my $PROG = 'metas/perl.d/perl-dist';
+my $PROG = 'preps/perl.d/perl-dist';
my $PBPROG = 'perl-pkgbuild';
sub DBG {}
diff --git a/metas/perl.d/perl-pkgbuild b/preps/perl.d/perl-pkgbuild
index 80a92e4..80a92e4 100755
--- a/metas/perl.d/perl-pkgbuild
+++ b/preps/perl.d/perl-pkgbuild
diff --git a/metas/perl.d/scrapecore b/preps/perl.d/scrapecore
index 25f5c80..25f5c80 100755
--- a/metas/perl.d/scrapecore
+++ b/preps/perl.d/scrapecore
diff --git a/setup b/setup
index b9ba165..6cd8bb7 100755
--- a/setup
+++ b/setup
@@ -4,7 +4,7 @@ set -e
umask 022
prog=setup
binfiles='genpkg prepkg modpkg pbfields putpkgtree getpkgtree injectdigs'
-metas='perl perl.d/
+preps='perl perl.d/
perl.d/fetchcpan perl.d/perl-dist perl.d/perl-pkgbuild
perl.d/scrapecore'
@@ -42,10 +42,10 @@ genpkg) md ~/bin
done
md ~/.genpkg
- md ~/.genpkg/metas
- for m in $metas
+ md ~/.genpkg/preps
+ for p in $preps
do
- ins "metas/$m" ~/.genpkg
+ ins "preps/$p" ~/.genpkg
done
md ~/.genpkg/var
;;