diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/build.sh | 92 | ||||
| -rwxr-xr-x | src/get.sh | 4 | ||||
| -rw-r--r-- | src/install.sh | 2 | ||||
| -rwxr-xr-x | src/profile.sh | 7 | ||||
| -rwxr-xr-x | src/xi.sh | 9 |
5 files changed, 110 insertions, 4 deletions
diff --git a/src/build.sh b/src/build.sh new file mode 100644 index 0000000..29a6398 --- /dev/null +++ b/src/build.sh @@ -0,0 +1,92 @@ +#!/bin/sh + +get_buildfiles () { + ${QUIET} || printf "${BLUE}Syncing sources..." + + [ -d "$BUILDFILES_DIR" ] || + mkdir -p $BUILDFILES_DIR + + cd $BUILDFILES_DIR + + { + git rev-parse --git-dir && + git pull || + git clone $BUILDFILES_GIT . + } > $(${VERBOSE}&&echo "/dev/stdout" || echo "/dev/null") 2>&1 && { + ${QUIET} || printf "${GREEN}${CHECKMARK}\n" + } +} + +get_deps () { + for f in $BUILDFILES_DIR/repo/*/$1/*.xibuild; do + sed -rn "s/^.*DEPS=\"(.*)\"/\1/p" $f + done +} + +build_order () { + while [ "$#" != "0" ]; do + name=$1 + shift + for dep in $(get_deps $name); do + set -- $@ $dep + echo $name $dep + done + done | tsort | reverse_lines +} + +# get the revision hash of a given builddir +# +get_revision () { + cat $1/*.xibuild | sha512sum | cut -d' ' -f1 +} + +# return the installed revision of the given package +# +get_installed_revision () { + local infofile=${INSTALLED_DIR}/$1/info + [ -f $infofile ] && { + sed -rn "s/^REVISION=(.*)$/\1/p" $infofile + } +} + +# test if the given package by name needs to be rebuilt +# +needs_build () { + [ "$(get_revision $(get_package_build $1))" != "$(get_installed_revision $1)" ] +} + + +get_package_build () { + local buildfile=$(find $BUILDFILES_DIR/repo -name "$1.xibuild" | head -1) + echo ${buildfile%/*} +} + +build_package () { + local name=$(basename $1) + local builddir=$(get_package_build $1) + + [ -d "$builddir" ] && { + xibuild -ci -r ${SYSROOT} $builddir + } || { + ${QUIET} || printf "${RED}Package $1 does not exist!\n" + } +} + +build () { + $DO_SYNC && get_buildfiles + mentioned=$@ + pkgs=$(build_order $@) + + set -- + for p in $pkgs; do + needs_build $p && set -- $@ $p + done + + printf "${LIGHT_BLUE}The following packages will be built: \n" + echo "\t${BLUE}$@\n" + + prompt_question "${WHITE} Continue?" && + for package in $@; do + build_package $package || return 1 + done +} @@ -14,7 +14,7 @@ list_deps() { # list all dependencies and sub dependencies of a package # resolve_deps () { - local out="${CACHE_DIR}/deps" + local out="$1"; shift local deps="" local i=0 @@ -157,7 +157,7 @@ get () { $DO_SYNC && sync touch $out - resolve_deps $@ + resolve_deps $out $@ for package in $(cat $out); do package_exists $package || { diff --git a/src/install.sh b/src/install.sh index f2f1a8c..20d582d 100644 --- a/src/install.sh +++ b/src/install.sh @@ -73,7 +73,7 @@ run_postinstall () { rm $file && printf "${GREEN}${CHECKMARK} postinstall $f!\n" } || { - printf "${RED}${CROSSMARK} failed postinstall $f!\n" + ${QUIET} || printf "${RED}${CROSSMARK} failed postinstall $f!\n" } done diff --git a/src/profile.sh b/src/profile.sh index 0ddcc0a..683738e 100755 --- a/src/profile.sh +++ b/src/profile.sh @@ -1,10 +1,11 @@ #!/bin/sh . /usr/lib/colors.sh +. /usr/lib/glyphs.sh + export HBAR_COMPLETE="-c ${GREEN}${BG_DEFAULT}" export HBAR_RED="-c ${BLACK}${BG_RED}" -. /usr/lib/glyphs.sh export CONF_FILE="/etc/xipkg.conf" @@ -23,4 +24,8 @@ export PACKAGE_CACHE="${CACHE_DIR}/packages" export SYNC_CACHE="${CACHE_DIR}/sync" export LOG_FILE="/var/log/xipkg.log" + +export BUILDFILES_DIR=$(parseconf -v dir.buildfiles) +export BUILDFILES_GIT=$(parseconf -v buildfiles_git) + [ ! -f ${LOG_FILE} ] && mkdir -p /var/log && touch ${LOG_FILE} @@ -125,6 +125,7 @@ done . ${LIBDIR}/query.sh . ${LIBDIR}/sync.sh . ${LIBDIR}/install.sh +. ${LIBDIR}/build.sh . ${LIBDIR}/get.sh . ${LIBDIR}/remove.sh @@ -156,6 +157,14 @@ else get $tofetch install $(cat $toinstall) ;; + "build") + shift + checkroot + + [ "$#" = "0" ] && set -- $(list_installed) + + build $@ + ;; "search") shift search $@ |