Merge branch 'dev' into beta

openbase · Jun 19, 2022 · e009b70 · e009b70
2 parents 7d8b2c1 + e275023
commit e009b70
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,8 @@
 [submodule "lib/jul"]
+	branch = dev
 	path = lib/jul
 	url = https://github.com/openbase/jul.git
 [submodule "lib/type"]
+	branch = dev
 	path = lib/type
 	url = https://github.com/openbase/type.git
diff --git a/update.sh b/update.sh
@@ -7,10 +7,5 @@ git pull
 git $@ submodule init
 git $@ submodule update --remote
 
-# detect project branch
-BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
-
-# switch to bco master versions
-git submodule foreach git checkout ${BRANCH_NAME}
-git submodule foreach git pull
-
+git submodule foreach ./install.sh
+./install.sh