From b37e921f6ae4c809f8bfc1777590c74dfc387ff2 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@gmail.com>
Date: Tue, 11 Feb 2020 17:45:58 +0100
Subject: [PATCH] Fix a few errors in the new script.

---
 HEADS      |  2 +-
 SConstruct | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/HEADS b/HEADS
index 2e33d610..ddca8c25 100644
--- a/HEADS
+++ b/HEADS
@@ -1 +1 @@
-{"engine": {"3.2": "8a0f94a688f18a9565a21657bf44791550aec96a", "master": "3e3f8a47616327d7faeb17f558bb81a943385e82"}, "world_generator": {"master": "09372b146936fda509f5c23a522e998d12f38e13"}, "entity_spell_system": {"master": "0bdf71c431b62b24d56c1fc178dbcb792e5dca3d"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "fd1ff4b4ff3cd718f4f85253f1ebc865894e5ffe"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "00f6c128bd0e9799b7f7f86e118ed68277fbe27d"}, "fast_quadratic_mesh_simplifier": {"master": "d3f3a829eff40a93464f6b321c13ce26d44e11e3"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "prop_tool": {"master": "df438053ebc900966f8f842fc65f0264f1271d49"}}
\ No newline at end of file
+{"engine": {"3.2": "8a0f94a688f18a9565a21657bf44791550aec96a", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "09372b146936fda509f5c23a522e998d12f38e13"}, "entity_spell_system": {"master": "0bdf71c431b62b24d56c1fc178dbcb792e5dca3d"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "fd1ff4b4ff3cd718f4f85253f1ebc865894e5ffe"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "00f6c128bd0e9799b7f7f86e118ed68277fbe27d"}, "fast_quadratic_mesh_simplifier": {"master": "d3f3a829eff40a93464f6b321c13ce26d44e11e3"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "prop_tool": {"master": "df438053ebc900966f8f842fc65f0264f1271d49"}}
\ No newline at end of file
diff --git a/SConstruct b/SConstruct
index af7b1b79..86f4595b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -113,12 +113,15 @@ def setup_repository(data, clone_path, branch = 'master'):
     os.chdir(full_path)
 
     subprocess.call('git reset --hard', shell=True)
+    subprocess.call('git clean -f', shell=True)
+    subprocess.call('git checkout -B ' + branch + ' origin/' + branch, shell=True)
     subprocess.call('git pull origin master', shell=True)
 
     if data[1] in target_commits:
         target = target_commits[data[1]][branch]
 
-    subprocess.call('git checkout -B master ' + target, shell=True)
+    subprocess.call('git checkout -B ' + branch + ' ' + target, shell=True)
+    subprocess.call('git clean -f', shell=True)
     subprocess.call('git reset --hard', shell=True)
 
     os.chdir(cwd)
@@ -338,11 +341,10 @@ if env['t']:
 if not os.path.isdir('./modules'):
     os.mkdir('./modules')
 
-
-if action in 'm':
+if 'm' in action:
     godot_branch = "master"
 
-if action in 'setup' or action[0] == 's':
+if 'setup' in action or action[0] == 's':
     if target == 'all':
         setup_all()
     elif target == 'engine':
@@ -356,7 +358,7 @@ if action in 'setup' or action[0] == 's':
         setup_addons()
     elif target == 'third_party_addons':
         setup_addons_third_party_addons()
-elif action in 'update' or action[0] == 'u':
+elif 'update' in action or action[0] == 'u':
     if target == 'all':
         update_all()
     elif target == 'engine':