From 1532c96b0e41a1cc23eb282665ca577ae7a0f367 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Thu, 25 Apr 2019 16:56:54 +0200
Subject: [PATCH] core+legacy: remove tag automagic from build scripts

---
 core/build-docker.sh    | 6 +-----
 legacy/script/fullbuild | 7 -------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/core/build-docker.sh b/core/build-docker.sh
index 2543b645a..18fb852d5 100755
--- a/core/build-docker.sh
+++ b/core/build-docker.sh
@@ -11,11 +11,7 @@ else
 fi
 
 IMAGE=trezor-core-build.$TOOLCHAIN_FLAVOR
-if [ -z "$1" ]; then
-	TAG=master
-else
-	TAG=core/${1}
-fi
+TAG=${1:-master}
 REPOSITORY=${2:-trezor}
 PRODUCTION=${PRODUCTION:-0}
 
diff --git a/legacy/script/fullbuild b/legacy/script/fullbuild
index 4d3c38002..30fce963f 100755
--- a/legacy/script/fullbuild
+++ b/legacy/script/fullbuild
@@ -88,13 +88,6 @@ main() {
     local bootloader_commit="$1"
     local firmware_commit="$2"
 
-    if [ "$bootloader_commit" != "HEAD" ]; then
-        bootloader_commit="legacy/$bootloader_commit"
-    fi
-    if [ "$firmware_commit" != "HEAD" ]; then
-        firmware_commit="legacy/$firmware_commit"
-    fi
-
     worktree_setup "$FIRMWARE_DIR" "$firmware_commit"
 
     if [ "$EMULATOR" != 1 ]; then