summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuild-repo.sh10
-rwxr-xr-xxibuild4
2 files changed, 7 insertions, 7 deletions
diff --git a/build-repo.sh b/build-repo.sh
index fd60aa9..d6200a3 100755
--- a/build-repo.sh
+++ b/build-repo.sh
@@ -3,7 +3,9 @@
XIBUILD=./xibuild
fetch () {
- git clone https://git.davidovski.xyz/xilinux/xipkgs
+ #git clone https://git.davidovski.xyz/xilinux/xipkgs
+
+ rsync -r ../buildfiles/ xipkgs
mkdir dist
}
@@ -34,9 +36,6 @@ build () {
$XIBUILD -o $DEST $BUILD_FILE
extend-index $BUILD_FILE $REPO_INDEX
-
- else
- echo "skipping $BUILD_FILE"
fi
done;
@@ -151,13 +150,14 @@ add-additional () {
clean () {
rm -rf xipkgs
rm -rf logs
+ chmod -R 777 tmp
rm -rf tmp
rm -rf xibuild.log
}
sync () {
for i in $@; do
- [[ $# = 0 ]] || rsync -vLta --no-perms --no-owner --no-group --delete -z -e ssh ./dist/ $i
+ [[ $# = 0 ]] || rsync -Lta --no-perms --no-owner --no-group --delete -z -e ssh ./dist/ $i
done;
}
diff --git a/xibuild b/xibuild
index d8661e1..a9fad9b 100755
--- a/xibuild
+++ b/xibuild
@@ -137,8 +137,8 @@ xibuild () {
package >> $LOGFILE 2>&1 && printf "$PASS packaged\n" || return 1;
# add postinstall script
- if command -v postinstall; then
- POSTINSTALL=$( && type postinstall | sed '1,3d;$d')
+ if command -v postinstall > /dev/null; then
+ POSTINSTALL=$(type postinstall | sed '1,3d;$d')
if [ ${#POSTINSTALL} != 0 ]; then
POST_DIR=$PKG_DEST/tmp/xi/postinstall
mkdir -p $POST_DIR