|
23 | 23 | --ssh-key=* )
|
24 | 24 | SSH_KEY="${i#*=}" ;;
|
25 | 25 |
|
26 |
| - --bl=* | --blacklist=* ) |
27 |
| - BLACKLIST="${BLACKLIST:+$BLACKLIST }${i#*=}" ;; |
| 26 | + --sl=* | --skiplist=* ) |
| 27 | + SKIPLIST="${SKIPLIST:+$SKIPLIST }${i#*=}" ;; |
28 | 28 |
|
29 | 29 | * )
|
30 | 30 | # unknown option
|
|
38 | 38 | done
|
39 | 39 |
|
40 | 40 | echo -e "\e[35m\e[1mBRANCH = ${BRANCH}\e[0m"
|
41 |
| -echo -e "\e[35m\e[1mBLACKLIST = ${BLACKLIST}\e[0m" |
| 41 | +echo -e "\e[35m\e[1mSKIPLIST = ${SKIPLIST}\e[0m" |
42 | 42 |
|
43 | 43 | # Set default value for IMAGE_NAME
|
44 | 44 | [ -z "$IMAGE_NAME" ] && IMAGE_NAME='tuerobotics/tue-env'
|
@@ -102,18 +102,18 @@ echo -e "\e[35m\e[1mtue-get install ros-python_orocos_kdl" "${INSTALL_BUILD_TARG
|
102 | 102 | # shellcheck disable=SC2145
|
103 | 103 | docker exec tue-env bash -c "source ~/.bashrc; tue-get install ros-python_orocos_kdl ${INSTALL_BUILD_TARGETS[*]}" # Needs to be installed fully as it needs to be build to generate docs
|
104 | 104 |
|
105 |
| -if [ -n "$BLACKLIST" ] |
| 105 | +if [ -n "$SKIPLIST" ] |
106 | 106 | then
|
107 |
| - echo -e '\e[35m\e[1mcatkin config --workspace $TUE_SYSTEM_DIR --blacklist '"${BLACKLIST}"'\e[0m' |
108 |
| - docker exec -t tue-env bash -c 'source ~/.bashrc; catkin config --workspace $TUE_SYSTEM_DIR --blacklist '"${BLACKLIST}" |
| 107 | + echo -e '\e[35m\e[1mcatkin config --workspace $TUE_SYSTEM_DIR --skiplist '"${SKIPLIST}"'\e[0m' |
| 108 | + docker exec -t tue-env bash -c 'source ~/.bashrc; catkin config --workspace $TUE_SYSTEM_DIR --skiplist '"${SKIPLIST}" |
109 | 109 | fi
|
110 | 110 |
|
111 | 111 | echo -e "\e[35m\e[1mtue-make --no-status python_orocos_kdl" "${INSTALL_BUILD_PKGS[*]}" "${BUILD_PKGS[*]}" "\e[0m"
|
112 | 112 | # shellcheck disable=SC2145
|
113 | 113 | docker exec -t tue-env bash -c "source ~/.bashrc; tue-make --no-status python_orocos_kdl ${INSTALL_BUILD_PKGS[*]} ${BUILD_PKGS[*]}" # Needs to be build to generate docs
|
114 | 114 |
|
115 |
| -if [ -n "$BLACKLIST" ] |
| 115 | +if [ -n "$SKIPLIST" ] |
116 | 116 | then
|
117 |
| - echo -e '\e[35m\e[1mcatkin config --workspace $TUE_SYSTEM_DIR --no-blacklist\e[0m' |
118 |
| - docker exec -t tue-env bash -c 'source ~/.bashrc; catkin config --workspace $TUE_SYSTEM_DIR --no-blacklist' # Clear blacklist |
| 117 | + echo -e '\e[35m\e[1mcatkin config --workspace $TUE_SYSTEM_DIR --no-skiplist\e[0m' |
| 118 | + docker exec -t tue-env bash -c 'source ~/.bashrc; catkin config --workspace $TUE_SYSTEM_DIR --no-skiplist' # Clear skiplist |
119 | 119 | fi
|
0 commit comments