From 9ab9481267bd6e7de2aa37de2a6d706726e09b5c Mon Sep 17 00:00:00 2001
From: Ivan Mahonin <bh@icystar.com>
Date: Oct 04 2016 14:01:53 +0000
Subject: Fix versions


---

diff --git a/docker-builder-data/build/script/common/manager.sh b/docker-builder-data/build/script/common/manager.sh
index 2bfa609..1a1a116 100755
--- a/docker-builder-data/build/script/common/manager.sh
+++ b/docker-builder-data/build/script/common/manager.sh
@@ -279,14 +279,12 @@ call_packet_function() {
         fi
     fi
 
-	if check_packet_function $NAME $FUNC; then
-		if [ ! -z "$PREV_HASH" ]; then
-			local HASH=`md5 "$FUNC_CURRENT_PACKET_DIR"` 
-			[ ! $? -eq 0 ] && return 1
-			if [ "$HASH" = "$PREV_HASH" ]; then
-				message "$NAME $FUNC - not changed"
-				return 0
-			fi
+	if [ ! -z "$PREV_HASH" ]; then
+		local HASH=`md5 "$FUNC_CURRENT_PACKET_DIR"` 
+		[ ! $? -eq 0 ] && return 1
+		if [ "$HASH" = "$PREV_HASH" ]; then
+			message "$NAME $FUNC - not changed"
+			return 0
 		fi
 	fi
 
diff --git a/docker-builder-data/build/script/include/inc-pkunpack-default.sh b/docker-builder-data/build/script/include/inc-pkunpack-default.sh
index 71d7411..2b2dab3 100644
--- a/docker-builder-data/build/script/include/inc-pkunpack-default.sh
+++ b/docker-builder-data/build/script/include/inc-pkunpack-default.sh
@@ -16,8 +16,11 @@ pkunpack() {
         	return 1
     	fi
 	fi
-	if [ ! -z "$PK_VERSION" ]; then
-		echo "$PK_VERSION" > "$UNPACK_PACKET_DIR/version-$NAME"
-		[ ! $? -eq 0 ] && return 1
-	fi 
+
+	if [ -z "$PK_VERSION" ]; then
+		PK_VERSION="$(echo "$ARG" | cut -d'-' -f 2-)"
+	fi
+	echo "$PK_VERSION" > "$UNPACK_PACKET_DIR/version-$NAME"
+	[ ! $? -eq 0 ] && return 1
+	return 0
 }
\ No newline at end of file
diff --git a/docker-builder-data/build/script/include/inc-pkunpack-git.sh b/docker-builder-data/build/script/include/inc-pkunpack-git.sh
index e6a79c7..fed24a3 100644
--- a/docker-builder-data/build/script/include/inc-pkunpack-git.sh
+++ b/docker-builder-data/build/script/include/inc-pkunpack-git.sh
@@ -7,11 +7,14 @@ pkunpack() {
      && rm -f -r "$UNPACK_PACKET_DIR/$PK_DIRNAME/.git"); then
         return 1
     fi
-	if [ ! -z "$PK_VERSION" ]; then
-		cd "$DOWNLOAD_PACKET_DIR/$PK_DIRNAME"
-		local COMMIT=`git rev-parse HEAD`
-		[ ! $? -eq 0 ] && return 1
-		echo "$PK_VERSION-$COMMIT" > "$UNPACK_PACKET_DIR/version-$NAME"
-		[ ! $? -eq 0 ] && return 1
-	fi 
+
+	if [ -z "$PK_VERSION" ]; then
+		PK_VERSION="$(echo "$NAME" | cut -d'-' -f 2-)"
+	fi
+	cd "$DOWNLOAD_PACKET_DIR/$PK_DIRNAME"
+	local COMMIT=`git rev-parse HEAD`
+	[ ! $? -eq 0 ] && return 1
+	echo "$PK_VERSION-$COMMIT" > "$UNPACK_PACKET_DIR/version-$NAME"
+	[ ! $? -eq 0 ] && return 1
+   	return 0
 }
diff --git a/docker-builder-data/build/script/packet/opentoonz-master.sh b/docker-builder-data/build/script/packet/opentoonz-master.sh
index 57bef59..6dcc853 100644
--- a/docker-builder-data/build/script/packet/opentoonz-master.sh
+++ b/docker-builder-data/build/script/packet/opentoonz-master.sh
@@ -1,5 +1,6 @@
 DEPS="jpeg-9b png-1.6.25 lz4-master glew-2.0.0 usb-1.0.20 sdl-2.0.4 superlu-4.3 cmake-3.6.2 freeglut-3.0.0 openblas-master boost-1.61.0 qt-5.7"
 
+PK_VERSION="1.1.1"
 PK_DIRNAME="opentoonz"
 PK_URL="https://github.com/opentoonz/$PK_DIRNAME.git"