X-Git-Url: http://gitweb/?a=blobdiff_plain;f=pkgadd-cross;h=168617144c86562320b666f7b170e38323cef231;hb=c6f15699aa06f450985c3d67441bfb7250c65e57;hp=8d68c81648a2cf644936046333224b0eaaec038a;hpb=8b010ae56207338aca1933e89ac7c28c877a2f47;p=pkgutils-cross.git

diff --git a/pkgadd-cross b/pkgadd-cross
index 8d68c81..1686171 100755
--- a/pkgadd-cross
+++ b/pkgadd-cross
@@ -2,9 +2,9 @@
 
 TOPDIR="$(cd $(dirname $(which $0)); pwd)"
 
-PKGADD=$TOPDIR/src/pkgadd
-PKGADD_CONF=$TOPDIR/src/pkgadd.conf
-PKGMK_CONF=$TOPDIR/src/pkgmk.conf
+PKGADD=$TOPDIR/pkgadd
+PKGADD_CONF=$TOPDIR/pkgadd.conf
+PKGMK_CONF=$TOPDIR/pkgmk-cross.conf
 . $PKGMK_CONF
 
 if [ -z "$CLFS" ]; then
@@ -18,6 +18,25 @@ if [ ! -f $CLFS/var/lib/pkg/db ]; then
   touch $CLFS/var/lib/pkg/db
 fi
 
-$PKGADD -c $PKGADD_CONF -r $CLFS $@
+# be sure that the path to package file exists
+# and if not prepend the package dir variable
+ARGS=""
+while [ "$1" ]; do
+  case $1 in
+    *.pkg.tar.*)
+      PATH_TO_PACKAGE="$1"
+      if [ ! -f "$PATH_TO_PACKAGE" ]; then
+        PATH_TO_PACKAGE="$PKGMK_PACKAGE_DIR/$PATH_TO_PACKAGE"
+      fi
+      ARGS="$ARGS $PATH_TO_PACKAGE"
+      ;;
+    *)
+      ARGS="$ARGS $1"
+      ;;
+  esac
+  shift
+done
+
+$PKGADD -c $PKGADD_CONF -r $CLFS $ARGS
 
 # End of file