Skip to content

Commit 8bc2801

Browse files
authored
Merge pull request #4243 from BsAtHome/fix_shellcheck_finals
shellcheck: Resolve tilde expansion issue and ensure detection in CI
2 parents 532a78d + 00446bc commit 8bc2801

3 files changed

Lines changed: 17 additions & 4 deletions

File tree

.github/scripts/configure.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/sh
2+
3+
set -eu #Needed so CI fails when anything is wrong
4+
set -x
5+
6+
#Any arguments are passed to configure
7+
8+
cd src
9+
./autogen.sh
10+
./configure "$@" --disable-check-runtime-deps --enable-werror

.github/workflows/ci.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,13 @@ jobs:
150150
- name: Install dependencies
151151
run: |
152152
set -x
153-
sudo apt-get -q update
153+
.github/scripts/install-deps.sh
154154
sudo apt-get --yes install shellcheck
155+
- name: Configure
156+
run: |
157+
set -x
158+
.github/scripts/configure.sh
155159
- name: Shellcheck
156-
continue-on-error: true
157160
run: |
158161
set -x
159162
scripts/shellcheck.sh

src/configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ if test "xyes" = "x$RUN_IN_PLACE"; then
721721
EMC2_PO_DIR=$EMC2_HOME/share/locale
722722
EMC2_HELP_DIR=$EMC2_HOME/docs/help
723723
EMC2_RTLIB_DIR=$EMC2_HOME/rtlib
724-
LINUXCNC_CONFIG_PATH="~/linuxcnc/configs:$EMC2_HOME/configs"
724+
LINUXCNC_CONFIG_PATH="\$HOME/linuxcnc/configs:$EMC2_HOME/configs"
725725
LINUXCNC_CONFIG_PATH_TCL="$::env(HOME)/linuxcnc/configs:$EMC2_HOME/configs"
726726
EMC2_NCFILES_DIR=$EMC2_HOME/nc_files
727727
REALTIME=$EMC2_HOME/scripts/realtime
@@ -743,7 +743,7 @@ else
743743
*/linuxcnc*) EMC2_RTLIB_DIR=$MODULE_DIR ;;
744744
*) EMC2_RTLIB_DIR=$MODULE_DIR/linuxcnc
745745
esac
746-
LINUXCNC_CONFIG_PATH="~/linuxcnc/configs:/usr/local/etc/linuxcnc/configs:"$(eval echo $EMC2_HELP_DIR)"/examples/sample-configs"
746+
LINUXCNC_CONFIG_PATH="\$HOME/linuxcnc/configs:/usr/local/etc/linuxcnc/configs:"$(eval echo $EMC2_HELP_DIR)"/examples/sample-configs"
747747
LINUXCNC_CONFIG_PATH_TCL="$::env(HOME)/linuxcnc/configs:/usr/local/etc/linuxcnc/configs:"$(eval echo $EMC2_HELP_DIR)"/examples/sample-configs"
748748
EMC2_NCFILES_DIR=${prefix}/share/linuxcnc/ncfiles
749749
REALTIME=${prefix}/lib/linuxcnc/realtime

0 commit comments

Comments
 (0)