summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/gensync25
-rwxr-xr-xscripts/makepkg10
-rwxr-xr-xscripts/makeworld2
3 files changed, 19 insertions, 18 deletions
diff --git a/scripts/gensync b/scripts/gensync
index e7c7724c..23347630 100755
--- a/scripts/gensync
+++ b/scripts/gensync
@@ -20,15 +20,15 @@
# USA.
#
-myver='2.7.7'
+myver='2.7.8'
usage() {
echo "gensync $myver"
echo "usage: $0 <root> <destfile> [package_directory]"
echo
echo "gensync will generate a sync database by reading all PKGBUILD files"
- echo "from <root>. gensync builds the database in /tmp/.gensync and then"
- echo "compresses it to <destfile>."
+ echo "from <root>. gensync builds the database in a temporary directory"
+ echo "and then compresses it to <destfile>."
echo
echo "gensync will calculate md5sums of packages in <destdir>, unless an"
echo "alternate [package_directory] is specified."
@@ -66,7 +66,7 @@ db_write_entry()
unset pkgname pkgver pkgrel pkgdesc
unset groups replaces provides depends conflicts
source $1 || return 1
- cd /tmp/.gensync
+ cd $gstmpdir
mkdir $pkgname-$pkgver-$pkgrel
cd $pkgname-$pkgver-$pkgrel
# desc
@@ -143,43 +143,40 @@ pkgdir=
if [ "$3" != "" ]; then
pkgdir=$3
fi
-
-rm -rf /tmp/.gensync || exit 1
-mkdir -p /tmp/.gensync || exit 1
+gstmpdir=$(mktemp -dt gensync.XXXXXXXXXX) || exit 1
if [ ! -d $rootdir ]; then
echo "gensync: invalid root dir: $rootdir" >&2
- rm -rf /tmp/.gensync
+ rm -rf $gstmpdir
exit 1
fi
echo "gensync: building database entries, generating md5sums..." >&2
cd `dirname $2`
-#for category in `find $rootdir/* -type d -maxdepth 0`; do
for file in `find $rootdir/* -name PKGBUILD`; do
pkgmd5sum=`get_md5checksum $file $pkgdir`
if [ -z $pkgmd5sum ]; then
echo "gensync: error generating checksum for $file" >&2
- rm -rf /tmp/.gensync
+ rm -rf $gstmpdir
exit 1
fi
db_write_entry $file
if [ $? -gt 0 ]; then
echo "gensync: error writing entry for $file" >&2
- rm -rf /tmp/.gensync
+ rm -rf $gstmpdir
exit 1
fi
done
echo "gensync: compressing to $destfile..." >&2
-cd /tmp/.gensync
+cd $gstmpdir
tar c * | gzip -9 >$destfile
if [ $? -gt 0 ]; then
echo "gensync: error writing to $destfile" >&2
- rm -rf /tmp/.gensync
+ rm -rf $gstmpdir
exit 1
fi
-rm -rf /tmp/.gensync
+rm -rf $gstmpdir
exit 0
diff --git a/scripts/makepkg b/scripts/makepkg
index d53bdd17..c0977b9f 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -20,8 +20,9 @@
# USA.
#
-myver='2.7.7'
+myver='2.7.8'
startdir=`pwd`
+PKGDEST=$startdir
USE_COLOR="n"
# source Arch's abs.conf if it's present
@@ -208,7 +209,6 @@ FORCE=0
NOEXTRACT=0
NOSTRIP=0
RMDEPS=0
-PKGDEST=$startdir
BUILDSCRIPT="./PKGBUILD"
ARGLIST=$@
@@ -275,7 +275,11 @@ while [ "$#" -ne "0" ]; do
done
# convert a (possibly) relative path to absolute
-cd $PKGDEST
+cd $PKGDEST 2>/dev/null
+if [ $? -ne 0 ]; then
+ error "Package destination directory does not exist or permission denied."
+ exit 1
+fi
PKGDEST=`pwd`
cd -
diff --git a/scripts/makeworld b/scripts/makeworld
index 1e6c7e6b..0397aa56 100755
--- a/scripts/makeworld
+++ b/scripts/makeworld
@@ -21,7 +21,7 @@
#
toplevel=`pwd`
-version="2.7.7"
+version="2.7.8"
usage() {
echo "makeworld version $version"