From 867e02fb16ed0423a2f64099e48a0529a280a6fa Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Mon, 31 Oct 2016 14:54:20 -0600
Subject: [PATCH] Pull master if need be
---
cook.sh | 112 +++++++++++++++++++++++++++++---------------------------
1 file changed, 59 insertions(+), 53 deletions(-)
diff --git a/cook.sh b/cook.sh
index 152935406..df6c7ff12 100755
--- a/cook.sh
+++ b/cook.sh
@@ -7,6 +7,63 @@ TARGET=x86_64-unknown-redox
set -e
+function op {
+ echo "$1" "$2"
+ case "$2" in
+ fetch)
+ if [ ! -d build ]
+ then
+ git clone --recursive "$GIT" build
+ fi
+
+ pushd build > /dev/null
+ git pull
+ git submodule sync
+ git submodule update --init --recursive
+ popd > /dev/null
+ ;;
+ unfetch)
+ rm -rf build
+ ;;
+ update)
+ pushd build > /dev/null
+ xargo update
+ popd > /dev/null
+ ;;
+ build)
+ pushd build > /dev/null
+ xargo build --target "$TARGET" $CARGOFLAGS
+ popd > /dev/null
+ ;;
+ clean)
+ pushd build > /dev/null
+ xargo clean
+ popd > /dev/null
+ ;;
+ stage)
+ mkdir -p stage/bin
+ pushd build > /dev/null
+ #TODO xargo install --root "../stage" $CARGOFLAGS
+ cp -v $(find target/x86_64-unknown-redox/debug/ -maxdepth 1 -type f ! -name "*.*") ../stage/bin
+ popd > /dev/null
+ ;;
+ unstage)
+ rm -rf stage
+ ;;
+ tar)
+ pushd stage > /dev/null
+ tar cf ../stage.tar .
+ popd > /dev/null
+ ;;
+ untar)
+ rm -rf stage.tar
+ ;;
+ *)
+ echo "$0 {package} {build|clean|fetch|update}"
+ ;;
+ esac
+}
+
if [ -n "$1" ]
then
if [ -d "recipes/$1" ]
@@ -15,62 +72,11 @@ then
source recipe.sh
for arg in "${@:2}"
do
- echo "$1" "$arg"
- case "$arg" in
- fetch)
- git clone --recursive "$GIT" build
- ;;
- unfetch)
- rm -rf build
- ;;
- pull)
- pushd build > /dev/null
- git pull
- git submodule sync
- git submodule update --init --recursive
- popd > /dev/null
- ;;
- update)
- pushd build > /dev/null
- xargo update
- popd > /dev/null
- ;;
- build)
- pushd build > /dev/null
- xargo build --target "$TARGET" $CARGOFLAGS
- popd > /dev/null
- ;;
- clean)
- pushd build > /dev/null
- xargo clean
- popd > /dev/null
- ;;
- stage)
- mkdir -p stage/bin
- pushd build > /dev/null
- #TODO xargo install --root "../stage" $CARGOFLAGS
- cp -v $(find target/x86_64-unknown-redox/debug/ -maxdepth 1 -type f ! -name "*.*") ../stage/bin
- popd > /dev/null
- ;;
- unstage)
- rm -rf stage
- ;;
- tar)
- pushd stage > /dev/null
- tar cf ../stage.tar .
- popd > /dev/null
- ;;
- untar)
- rm -rf stage.tar
- ;;
- *)
- echo "$0 {package} {build|clean|fetch|update}"
- ;;
- esac
+ op "$1" "$arg"
done
else
echo "$0: recipe '$1' not found"
fi
else
- echo "$0 {package} {build|clean|fetch|update}"
+ echo "$0 {package} {build|clean|fetch|unfetch|stage|unstage|tar|untar|update}"
fi
--
GitLab