From 17be739bf7ebc0451fe299e306b541e3ceda636e Mon Sep 17 00:00:00 2001
From: Ivan Mahonin <bh@icystar.com>
Date: Oct 04 2016 20:16:19 +0000
Subject: Fix buggz


---

diff --git a/docker-builder-data/build/script/common/manager.sh b/docker-builder-data/build/script/common/manager.sh
index 1a1a116..abf399a 100755
--- a/docker-builder-data/build/script/common/manager.sh
+++ b/docker-builder-data/build/script/common/manager.sh
@@ -195,15 +195,11 @@ prepare_build() {
 }
 
 prepare_install() {
-    if ! cp -f $BUILD_PACKET_DIR/version-* "$INSTALL_PACKET_DIR/"; then
-        return 1
-    fi
+    cp -f $BUILD_PACKET_DIR/version-* "$INSTALL_PACKET_DIR/" || true
 }
 
 prepare_install_release() {
-    if ! cp -f $INSTALL_PACKET_DIR/version-* "$INSTALL_RELEASE_PACKET_DIR/"; then
-        return 1
-    fi
+    cp -f $INSTALL_PACKET_DIR/version-* "$INSTALL_RELEASE_PACKET_DIR/" || true
 }
 
 set_environment_vars() {
diff --git a/docker-builder-i386/Dockerfile b/docker-builder-i386/Dockerfile
index dc4b447..436dc6f 100644
--- a/docker-builder-i386/Dockerfile
+++ b/docker-builder-i386/Dockerfile
@@ -55,5 +55,6 @@ RUN apt-get -yq install m4
 RUN apt-get -yq install libfuse-dev
 RUN apt-get -yq install git
 RUN apt-get -yq install wget
+RUN apt-get -yq install bzip2
 
 CMD mkdir /build
diff --git a/docker-builder/Dockerfile b/docker-builder/Dockerfile
index 33f2d3b..384a704 100644
--- a/docker-builder/Dockerfile
+++ b/docker-builder/Dockerfile
@@ -55,5 +55,6 @@ RUN apt-get -yq install m4
 RUN apt-get -yq install libfuse-dev
 RUN apt-get -yq install git
 RUN apt-get -yq install wget
+RUN apt-get -yq install bzip2
 
 CMD mkdir /build
diff --git a/publish/update-opentoonz.sh b/publish/update-opentoonz.sh
index 46ecf0d..65c1697 100755
--- a/publish/update-opentoonz.sh
+++ b/publish/update-opentoonz.sh
@@ -8,7 +8,7 @@ BASE_DIR=`dirname "$BASE_DIR"`
 cd "$OLDDIR"
 DATA_DIR="$BASE_DIR/docker-builder-data"
 BUILD_DIR=$DATA_DIR/build
-PUBLISH_DIR=$DATA_DIR/publish
+PUBLISH_DIR=$BASE_DIR/publish
 
 CONFIG_FILE="$BASE_DIR/config.sh"
 PACKET_BUILD_DIR="$BUILD_DIR/packet"
@@ -27,10 +27,11 @@ run() {
 	echo ""
 	
 	sudo $SCRIPT update opentoonz-master
-	sudo $SCRIPT install_release opentoonz-master
-	local DIR="$PACKET_BUILD_DIR/$PLATFORM/opentoonz-master/install_release"
-	local VERSION=`cat "$DIR/version-opentoonz-master" | cut -d'-' -f 1`
-	local COMMIT=`cat "$DIR/version-opentoonz-master" | cut -d'-' -f 2-`
+	sudo $SCRIPT install_release opentoonz-appimage
+	local DIR="$PACKET_BUILD_DIR/$PLATFORM/opentoonz-appimage/install_release"
+	local VERSION_FILE="$PACKET_BUILD_DIR/$PLATFORM/opentoonz-appimage/envdeps_release/version-opentoonz-master"
+	local VERSION=`cat "$VERSION_FILE" | cut -d'-' -f 1`
+	local COMMIT=`cat "$VERSION_FILE" | cut -d'-' -f 2-`
 	COMMIT="${COMMIT:0:5}"
 	local DATE=`date -u +%Y.%m.%d`
 	if ! ls $PUBLISH_DIR/opentoonz-$VERSION-$COMMIT-*-$PLATFORM_SUFFIX.appimage 1> /dev/null 2>&1; then