From a8636e960d24cf986b716fc0dd923313f0366eb4 Mon Sep 17 00:00:00 2001 From: davidovski Date: Wed, 16 Feb 2022 16:48:43 +0000 Subject: added moved preparing outside of xib env --- build.sh | 1 + xib_env | 17 ----------------- xibuild/prepare.sh | 19 +++++++++++++++++++ 3 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 xibuild/prepare.sh diff --git a/build.sh b/build.sh index 97661e4..2340de4 100755 --- a/build.sh +++ b/build.sh @@ -3,6 +3,7 @@ source xib_env cd xibuild +./prepare.sh ./build_all.sh || exit 1 ./make_infos.sh diff --git a/xib_env b/xib_env index 60d09ef..ae017b2 100755 --- a/xib_env +++ b/xib_env @@ -20,20 +20,3 @@ export DEVELOPMENT_BUILDFILES="/home/david/docs/proj/xilinux/buildfiles" export BUILDFILES_GIT_REPO="https://xi.davidovski.xyz/git/buildfiles.git" export INSTALLED_PACKAGES="$XIB_CHROOT/installed" -mkdir -p $XIB_DIR $XIB_BUILDFILES $XIB_CHROOT $XIB_EXPORT - -if [ -d $DEVELOPMENT_BUILDFILES ]; then - cp -r $DEVELOPMENT_BUILDFILES/* $XIB_BUILDFILES/ -else - if [ -d $XIB_BUILDFILES/.git ]; then - cd $XIB_BUILDFILES - git pull - cd $OLDPWD - else - git clone $BUILDFILES_GIT_REPO $XIB_BUILDFILES - fi -fi - -[ -f $INSTALLED_PACKAGES ] || touch $INSTALLED_PACKAGES - -[ -f $XIB_CHROOT/etc/resolv.conf ] || cp /etc/resolv.conf $XIB_CHROOT/etc/resolv.conf diff --git a/xibuild/prepare.sh b/xibuild/prepare.sh new file mode 100644 index 0000000..81f52a5 --- /dev/null +++ b/xibuild/prepare.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +mkdir -p $XIB_DIR $XIB_BUILDFILES $XIB_CHROOT $XIB_EXPORT + +if [ -d $DEVELOPMENT_BUILDFILES ]; then + cp -r $DEVELOPMENT_BUILDFILES/* $XIB_BUILDFILES/ +else + if [ -d $XIB_BUILDFILES/.git ]; then + cd $XIB_BUILDFILES + git pull + cd $OLDPWD + else + git clone $BUILDFILES_GIT_REPO $XIB_BUILDFILES + fi +fi + +[ -f $INSTALLED_PACKAGES ] || touch $INSTALLED_PACKAGES + +[ -f $XIB_CHROOT/etc/resolv.conf ] || cp /etc/resolv.conf $XIB_CHROOT/etc/resolv.conf -- cgit v1.2.1