From 1dd281ae1738567d68264a094187979c0e28a390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Je=CC=81ro=CC=82me=20Schneider?= Date: Sun, 18 Nov 2012 21:50:20 +0100 Subject: [PATCH] Updated package scripts. Former-commit-id: 77cb6182e85b92ad278389975bc6f8c9a93e146b --- Core/Frameworks/Baikal/Scripts/package-flat.sh | 15 ++++++++------- Core/Frameworks/Baikal/Scripts/package-regular.sh | 15 +++++++++------ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Core/Frameworks/Baikal/Scripts/package-flat.sh b/Core/Frameworks/Baikal/Scripts/package-flat.sh index 482308d..1f8a35e 100755 --- a/Core/Frameworks/Baikal/Scripts/package-flat.sh +++ b/Core/Frameworks/Baikal/Scripts/package-flat.sh @@ -1,4 +1,9 @@ #!/usr/bin/env sh +TEMPDATE="`date +%Y-%m-%d-%H-%M-%S`" +TEMPDIR="/tmp/baikal-flat-$TEMPDATE-temp" +TEMPARCHIVE="$TEMPDIR/temparchive.tgz" +TEMPDIRDEREFERENCE="/tmp/baikal-flat-$TEMPDATE" + echo "########################################################################" echo "#" echo "# Baïkal Packaging script" @@ -6,16 +11,12 @@ echo "#" echo "# Packaging project for flat distribution (replacing symlinks" echo "# by their target). Useful for FTP deployment" echo "#" -echo "#" +echo "# TEMPDIR: $TEMPDIR" -TEMPDATE="`date +%Y-%m-%d-%H-%M-%S`" -TEMPDIR="/tmp/baikal-flat-$TEMPDATE-temp" -TEMPARCHIVE="$TEMPDIR/temparchive.tgz" -TEMPDIRDEREFERENCE="/tmp/baikal-flat-$TEMPDATE" +rm -rf /tmp/baikal-flat # Export Project # Requires the git-archive-all script by https://github.com/Kentzo (https://github.com/Kentzo/git-archive-all) -rm -rf /tmp/baikal-flat mkdir $TEMPDIR && \ git-archive-all --force-submodules $TEMPARCHIVE && \ @@ -25,7 +26,7 @@ cd $TEMPDIR && tar -xzf $TEMPARCHIVE && rm $TEMPARCHIVE && \ cp -RfL $TEMPDIR $TEMPDIRDEREFERENCE && \ rm -Rf $TEMPDIR && \ -TEMPDIR=$TEMPDIRDEREFERENCE && \ +TEMPDIR=$TEMPDIRDEREFERENCE/temparchive && \ # Jump to tempdir cd $TEMPDIR && \ diff --git a/Core/Frameworks/Baikal/Scripts/package-regular.sh b/Core/Frameworks/Baikal/Scripts/package-regular.sh index e74663c..b731ebf 100644 --- a/Core/Frameworks/Baikal/Scripts/package-regular.sh +++ b/Core/Frameworks/Baikal/Scripts/package-regular.sh @@ -1,24 +1,27 @@ #!/usr/bin/env sh +TEMPDATE="`date +%Y-%m-%d-%H-%M-%S`" +TEMPDIR="/tmp/baikal-regular-$TEMPDATE" +TEMPARCHIVE="$TEMPDIR/temparchive.tgz" + echo "########################################################################" echo "#" echo "# Baïkal Packaging script" echo "#" echo "# Packaging project for regular distribution" echo "#" -echo "#" - -TEMPDATE="`date +%Y-%m-%d-%H-%M-%S`" -TEMPDIR="/tmp/baikal-regular-$TEMPDATE" -TEMPARCHIVE="$TEMPDIR/temparchive.tgz" +echo "# TEMPDIR: $TEMPDIR" rm -rf /tmp/baikal-regular # Export Project # Requires the git-archive-all script by https://github.com/Kentzo (https://github.com/Kentzo/git-archive-all) -mkdir $TEMPDIR && \ + +mkdir -p $TEMPDIR && \ git-archive-all --force-submodules $TEMPARCHIVE && \ cd $TEMPDIR && tar -xzf $TEMPARCHIVE && rm $TEMPARCHIVE && \ +TEMPDIR=$TEMPDIR/temparchive && \ + # Jump to tempdir cd $TEMPDIR && \