Skip to content

Commit f2fa1be

Browse files
committed
fix shellcheck test failure
1 parent aed1a38 commit f2fa1be

File tree

6 files changed

+15
-9
lines changed

6 files changed

+15
-9
lines changed

crates/fig_integrations/src/shell/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ impl ShellExt for Shell {
196196
include_str!("scripts/bash-preexec.sh"),
197197
"}\n",
198198
"__fig_source_bash_preexec\n",
199+
"# shellcheck disable=SC2329\n",
199200
"function __bp_adjust_histcontrol() { :; }\n",
200201
include_str!("scripts/pre.sh")
201202
)
@@ -206,6 +207,7 @@ impl ShellExt for Shell {
206207
include_str!("scripts/bash-preexec.sh"),
207208
"}\n",
208209
"__fig_source_bash_preexec\n",
210+
"# shellcheck disable=SC2329\n",
209211
"function __bp_adjust_histcontrol() { :; }\n",
210212
include_str!("scripts/post.bash")
211213
)

crates/fig_integrations/src/shell/scripts/bash-preexec.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ __bp_require_not_readonly() {
8888
# Remove ignorespace and or replace ignoreboth from HISTCONTROL
8989
# so we can accurately invoke preexec with a command from our
9090
# history even if it starts with a space.
91-
# shellcheck disable=SC2317
91+
# shellcheck disable=SC2317,SC2329
9292
__bp_adjust_histcontrol() {
9393
local histcontrol
9494
histcontrol="${HISTCONTROL:-}"

crates/q_cli/tests/snapshots/init__init_snapshot_bash_post_bash_profile.snap

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
source: q_cli/tests/init.rs
2+
source: crates/q_cli/tests/init.rs
33
expression: init
44
---
55
Q_SHELL="/bin/zsh"
@@ -94,7 +94,7 @@ __bp_require_not_readonly() {
9494
# Remove ignorespace and or replace ignoreboth from HISTCONTROL
9595
# so we can accurately invoke preexec with a command from our
9696
# history even if it starts with a space.
97-
# shellcheck disable=SC2317
97+
# shellcheck disable=SC2317,SC2329
9898
__bp_adjust_histcontrol() {
9999
local histcontrol
100100
histcontrol="${HISTCONTROL:-}"
@@ -387,6 +387,7 @@ if [[ -z "${__bp_delay_install:-}" ]]; then
387387
fi;
388388
}
389389
__fig_source_bash_preexec
390+
# shellcheck disable=SC2329
390391
function __bp_adjust_histcontrol() { :; }
391392
if [[ -n "${BASH:-}" ]]; then
392393

crates/q_cli/tests/snapshots/init__init_snapshot_bash_post_bashrc.snap

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
source: q_cli/tests/init.rs
2+
source: crates/q_cli/tests/init.rs
33
expression: init
44
---
55
Q_SHELL="/bin/zsh"
@@ -94,7 +94,7 @@ __bp_require_not_readonly() {
9494
# Remove ignorespace and or replace ignoreboth from HISTCONTROL
9595
# so we can accurately invoke preexec with a command from our
9696
# history even if it starts with a space.
97-
# shellcheck disable=SC2317
97+
# shellcheck disable=SC2317,SC2329
9898
__bp_adjust_histcontrol() {
9999
local histcontrol
100100
histcontrol="${HISTCONTROL:-}"
@@ -387,6 +387,7 @@ if [[ -z "${__bp_delay_install:-}" ]]; then
387387
fi;
388388
}
389389
__fig_source_bash_preexec
390+
# shellcheck disable=SC2329
390391
function __bp_adjust_histcontrol() { :; }
391392
if [[ -n "${BASH:-}" ]]; then
392393

crates/q_cli/tests/snapshots/init__init_snapshot_bash_pre_bash_profile.snap

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
source: q_cli/tests/init.rs
2+
source: crates/q_cli/tests/init.rs
33
expression: init
44
---
55
Q_SHELL="/bin/zsh"
@@ -95,7 +95,7 @@ __bp_require_not_readonly() {
9595
# Remove ignorespace and or replace ignoreboth from HISTCONTROL
9696
# so we can accurately invoke preexec with a command from our
9797
# history even if it starts with a space.
98-
# shellcheck disable=SC2317
98+
# shellcheck disable=SC2317,SC2329
9999
__bp_adjust_histcontrol() {
100100
local histcontrol
101101
histcontrol="${HISTCONTROL:-}"
@@ -388,6 +388,7 @@ if [[ -z "${__bp_delay_install:-}" ]]; then
388388
fi;
389389
}
390390
__fig_source_bash_preexec
391+
# shellcheck disable=SC2329
391392
function __bp_adjust_histcontrol() { :; }
392393
#!/usr/bin/env bash
393394

crates/q_cli/tests/snapshots/init__init_snapshot_bash_pre_bashrc.snap

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
source: q_cli/tests/init.rs
2+
source: crates/q_cli/tests/init.rs
33
expression: init
44
---
55
Q_SHELL="/bin/zsh"
@@ -95,7 +95,7 @@ __bp_require_not_readonly() {
9595
# Remove ignorespace and or replace ignoreboth from HISTCONTROL
9696
# so we can accurately invoke preexec with a command from our
9797
# history even if it starts with a space.
98-
# shellcheck disable=SC2317
98+
# shellcheck disable=SC2317,SC2329
9999
__bp_adjust_histcontrol() {
100100
local histcontrol
101101
histcontrol="${HISTCONTROL:-}"
@@ -388,6 +388,7 @@ if [[ -z "${__bp_delay_install:-}" ]]; then
388388
fi;
389389
}
390390
__fig_source_bash_preexec
391+
# shellcheck disable=SC2329
391392
function __bp_adjust_histcontrol() { :; }
392393
#!/usr/bin/env bash
393394

0 commit comments

Comments
 (0)