diff options
author | obrien <obrien@FreeBSD.org> | 2001-02-11 03:50:32 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2001-02-11 03:50:32 +0000 |
commit | 12f003b025bc6b21f40b9279b3d3a7ed92950f1b (patch) | |
tree | c9eed4ee43154b74077d20a15bfe81ac5c883e2b /release | |
parent | 93cac6720746b05d7f6a5b975b53050bcd6fe970 (diff) | |
download | FreeBSD-src-12f003b025bc6b21f40b9279b3d3a7ed92950f1b.zip FreeBSD-src-12f003b025bc6b21f40b9279b3d3a7ed92950f1b.tar.gz |
Default the plist dir as we know where it is relative to us.
Diffstat (limited to 'release')
-rwxr-xr-x | release/scripts/X11/package_x_dists.sh | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/release/scripts/X11/package_x_dists.sh b/release/scripts/X11/package_x_dists.sh index 6648fe9..4c9c4a1 100755 --- a/release/scripts/X11/package_x_dists.sh +++ b/release/scripts/X11/package_x_dists.sh @@ -11,25 +11,25 @@ # usage info # usage() { - echo "$0 <plist dir> <work dir> <tarball dir>" + echo "$0 <work dir> <tarball dir>" echo - echo "Where <plist dir> contains all the packing lists generated by" - echo "the generate_plists.sh script and <work dir> is the name of the" - echo "scratch directory we can do our work under. Note that we toast" - echo "the scratch directory at the beginning." + echo "Where <work dir> is the name of the scratch directory we can do" + echo " our work under. Note that we toast the scratch directory at the" + echo " beginning." exit 1 } # check our command line -if [ $# -ne 3 ]; then +if [ $# -ne 2 ]; then usage fi # setup our directory variables -plist_dir=$1 -work_dir=$2 -tarball_dir=$3 +# note the generate_plists.sh script can be used to populate $plist_dir home_dir=`dirname $0` +plist_dir=${home_dir}/plists/`uname -m` +work_dir=$1 +tarball_dir=$2 # setup the scratch directory [ -r ${work_dir} ] && rm -rf ${work_dir} @@ -47,16 +47,6 @@ if ! ${work_dir}/scripts/build_x.sh ${work_dir}/tmp; then exit 1 fi -if ! mkdir -p ${plist_dir}; then - echo "Could not create plist dir [${plist_dir}]!" - echo - usage -fi -if ! mkdir -p ${tarball_dir}; then - echo "Could not create tarball dir [${tarball_dir}]!" - echo - usage -fi # now package it up into tarballs if ! ${work_dir}/scripts/generate_tarballs.sh \ ${work_dir}/tmp/usr/X11R6 ${plist_dir} ${tarball_dir}; then |