summaryrefslogtreecommitdiff
path: root/xibuild
diff options
context:
space:
mode:
Diffstat (limited to 'xibuild')
-rwxr-xr-xxibuild/build_all.sh7
-rwxr-xr-xxibuild/build_package.sh2
2 files changed, 5 insertions, 4 deletions
diff --git a/xibuild/build_all.sh b/xibuild/build_all.sh
index 9c3d7cc..f72e274 100755
--- a/xibuild/build_all.sh
+++ b/xibuild/build_all.sh
@@ -14,7 +14,8 @@ XIPKG_INSTALL=/usr/lib/xipkg/install.sh
run_postinstall () {
postinstall="$XIB_CHROOT/var/lib/xipkg/postinstall"
if [ -d $postinstall ]; then
- for file in "$postinstall/*.sh"; do
+ printf "${INFO}${TABCHAR}postinstall "
+ for file in $(ls $postinstall/*.sh); do
f=$(basename $file)
# run the postinstall file
@@ -22,8 +23,7 @@ run_postinstall () {
chmod 755 $file
xichroot "$XIB_CHROOT" "/var/lib/xipkg/postinstall/$f"
rm $file
-
- printf "$PASS run postinstall for $f!\n"
+ printf "${PASS}${CHECKMARK}\n"
done
rmdir $postinstall
fi
@@ -49,6 +49,7 @@ build_package () {
SYSROOT=$XIB_CHROOT
VERBOSE=false
install_package $exported_pkg $name && printf "${PASS}${CHECKMARK}\n" || printf "${NEUTRAL}${CHECKMARK}\n"
+ run_postinstall
fi
return 0
diff --git a/xibuild/build_package.sh b/xibuild/build_package.sh
index fb4069e..bc34701 100755
--- a/xibuild/build_package.sh
+++ b/xibuild/build_package.sh
@@ -86,7 +86,7 @@ fetch_source () {
http*)
;;
*)
- url="file://${XIB_BUILDFILES}/extra/$url"
+ url="file://${XIB_BUILDFILES}/extra/$NAME/$url"
;;
esac