wip

commands/core.d/bootstrap

@@ -194,7 +194,7 @@ function core_bootstrap() {
   . "$_GO_USE_MODULES" 'installation' 'core'
 
   if [[ ! -r "$_HEADSTART_PROJECT_CONFIG" && "$interactive" == false ]]; then
-    abort "twmn is not configured yet, run bootstrap in interactive mode" "$_HEADSTART_EC_NOTFND"
+    abort "fiveg is not configured yet, run bootstrap in interactive mode" "$_HEADSTART_EC_NOTFND"
   fi
 
   if [[ "$(get_installation_status)" == 'bootstrapped' && "$update" == 'false' ]]; then

commands/devel.d/dependency-add

@@ -29,9 +29,9 @@ done
 info "OK"
 
 personal_repo=''
-echo "Give the public personal repo from where to clone the dependency. Type"\
-  "'skip' if there is no patched version of the dependency and you want to add"\
-  "add it directly from the upstream repositories (in a later step)."\
+echo "Give the public personal repo from where to clone the dependency. Type" \
+  "'skip' if there is no patched version of the dependency and you want to add" \
+  "add it directly from the upstream repositories (in a later step)." \
   "Example: https://github.com/tterranigma/ansible-php-dns.git" >&${STDOUT}
 while [ "$personal_repo" == "" ]; do
   read -p "personal repo: " personal_repo
@@ -43,7 +43,7 @@ upstream_repo=''
 echo "Give the upstream repo that the original code for the dependency" \
   "can be found. Type 'skip' if the dependency is our code made public as a" \
   "FOSS contribution and there is no upstream other than the personal repo" \
-  "already added. Example: https://github.com/geerlingguy/ansible-role-php.git"\
+  "already added. Example: https://github.com/geerlingguy/ansible-role-php.git" \
   >&${STDOUT}
 while [ "$upstream_repo" == "" ]; do
   read -p "upstream repo: " upstream_repo
@@ -52,15 +52,6 @@ done
 info "OK"
 
 # TODO create the documantation section
-kth_repo=''
-echo "Give the KTH repo url where the dependency will be mirrored to." \
-  "Type skip if not applicable. Please see the documentation on 'Adding new" \
-  "project dependencies'. Example:" \
-  "git@gits-15.sys.kth.se:pontusj/ansible-role-php.git" >&${STDOUT}
-while [ "$kth_repo" == "" ]; do
-  read -p "repo url: " kth_repo
-done
-
 if [ "$personal_repo" == "skip" ] && [ "$upstream_repo" == "skip" ]; then
   abort "There was no public repo given, neither a 'personal' nor an 'upstream'\
     one. Rerun 'make dependency_add' and provide at least one of the two types \
@@ -69,11 +60,7 @@ fi
 
 info "\nAdding the new dependency..."
 if [ "$upstream_repo" != "skip" ] && [ "$personal_repo" != "skip" ]; then
-  echo "$name,$upstream_repo" >> .gitupstreams
-fi
-
-if [ "$kth_repo" != "skip" ]; then
-  echo "$name,$kth_repo" >> .gitmirrors
+  echo "$name,$upstream_repo" >>.gitupstreams
 fi
 
 if [ "$personal_repo" != "skip" ]; then

commands/devel.d/test

@@ -51,7 +51,7 @@ _test_main() {
   # TODO see if these paths actually work
   declare -x _GO_BATS_COVERAGE_INCLUDE=('headstart' 'commands' 'lib')
 
-  declare -x TWMN_TEST_COMMON_ENV="$TWMN_TEST_DIR/unit/common/environment.bash"
+  declare -x FIVEG_TEST_COMMON_ENV="$FIVEG_TEST_DIR/unit/common/environment.bash"
   # This is meant to be used by test files to load the common environment.
 
   . "$_GO_USE_MODULES" 'bats-main'

bats-core @ 29050405

-Subproject commit 1740811fd10a1e2b085f2c0ee768673090d36aa4
+Subproject commit 290504056fe6187e28c829d8ae3e2c8d7f143ec8