nix-community/nix-direnv
1
0
Fork 0
mirror of https://github.com/nix-community/nix-direnv.git synced 2025-11-08 19:46:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix shellcheck warnings

Browse source
This commit is contained in:
Jörg Thalheim 2021-01-02 11:18:53 +01:00
parent f289bce100
commit 944585ff46
No known key found for this signature in database
GPG key ID: 003F2096411B5F92
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ci.nix
View file

@ -7,7 +7,7 @@ mkShell {
shellHook = '' shellHook = ''
set -e set -e
echo -e "\x1b[32m## run shellcheck\x1b[0m" echo -e "\x1b[32m## run shellcheck\x1b[0m"
LC_ALL=en_US.utf-8 black --check . shellcheck direnvrc
echo -e "\x1b[32m## run black\x1b[0m" echo -e "\x1b[32m## run black\x1b[0m"
LC_ALL=en_US.utf-8 black --check . LC_ALL=en_US.utf-8 black --check .
echo -e "\x1b[32m## run flake8\x1b[0m" echo -e "\x1b[32m## run flake8\x1b[0m"

23
direnvrc
View file

@ -56,8 +56,10 @@ use_flake() {
watch_file flake.nix watch_file flake.nix
watch_file flake.lock watch_file flake.lock
local profile="$(direnv_layout_dir)/flake-profile" local layout_dir
local flake="$(direnv_layout_dir)/flake" layout_dir=$(direnv_layout_dir)
local profile="${layout_dir}/flake-profile"
local flake="${layout_dir}/flake"
local profile_rc="${profile}.rc" local profile_rc="${profile}.rc"
if [[ ! -e "$profile" if [[ ! -e "$profile"
@ -68,9 +70,8 @@ use_flake() {
|| flake.lock -nt "$profile_rc" || flake.lock -nt "$profile_rc"
]]; ]];
then then
local tmp_profile="$(direnv_layout_dir)/flake-profile.$$" local tmp_profile="${layout_dir}/flake-profile.$$"
[[ -d "$(direnv_layout_dir)" ]] || mkdir -p "$(direnv_layout_dir)" [[ -d "$layout_dir" ]] || mkdir -p "$layout_dir"
local tmp_profile_rc=$(nix print-dev-env --profile "$tmp_profile")
local tmp_profile_rc local tmp_profile_rc
tmp_profile_rc=$("${NIX_BIN_PREFIX}nix" print-dev-env \ tmp_profile_rc=$("${NIX_BIN_PREFIX}nix" print-dev-env \
--experimental-features "nix-command flakes" \ --experimental-features "nix-command flakes" \
@ -118,10 +119,9 @@ use_flake() {
} }
use_nix() { use_nix() {
local path direnv_dir local path layout_dir
path=$(nix-instantiate --find-file nixpkgs)
direnv_dir=$(direnv_layout_dir)
path=$("${NIX_BIN_PREFIX}nix-instantiate" --find-file nixpkgs) path=$("${NIX_BIN_PREFIX}nix-instantiate" --find-file nixpkgs)
layout_dir=$(direnv_layout_dir)
if [[ "${direnv:-}" == "" ]]; then if [[ "${direnv:-}" == "" ]]; then
log_status "\$direnv environment variable was not defined. Was this script run inside direnv?" log_status "\$direnv environment variable was not defined. Was this script run inside direnv?"
@ -141,7 +141,7 @@ use_nix() {
fi fi
fi fi
local cache="$direnv_dir/cache-${version:-unknown}" local cache="${layout_dir}/cache-${version:-unknown}"
local update_drv=0 local update_drv=0
if [[ ! -e "$cache" if [[ ! -e "$cache"
@ -151,7 +151,7 @@ use_nix() {
|| shell.nix -nt "$cache" || shell.nix -nt "$cache"
]]; ]];
then then
[[ -d "$direnv_dir" ]] || mkdir -p "$direnv_dir" [[ -d "$layout_dir" ]] || mkdir -p "$layout_dir"
local dump_cmd tmp local dump_cmd tmp
dump_cmd="echo -n _____direnv_____; \"$direnv\" dump bash" dump_cmd="echo -n _____direnv_____; \"$direnv\" dump bash"
tmp=$("${NIX_BIN_PREFIX}nix-shell" \ tmp=$("${NIX_BIN_PREFIX}nix-shell" \
@ -171,8 +171,7 @@ use_nix() {
# This part is based on https://discourse.nixos.org/t/what-is-the-best-dev-workflow-around-nix-shell/418/4 # This part is based on https://discourse.nixos.org/t/what-is-the-best-dev-workflow-around-nix-shell/418/4
if [[ "${out:-}" != "" ]] && (( update_drv )); then if [[ "${out:-}" != "" ]] && (( update_drv )); then
local drv_link="${direnv_dir}/drv" drv local drv_link="${layout_dir}/drv" drv
drv=$(nix show-derivation "$out" | grep -E -o -m1 '/nix/store/.*.drv')
drv=$("${NIX_BIN_PREFIX}nix" show-derivation "$out" \ drv=$("${NIX_BIN_PREFIX}nix" show-derivation "$out" \
--experimental-features "nix-command flakes" \ --experimental-features "nix-command flakes" \
| grep -E -o -m1 '/nix/store/.*.drv') | grep -E -o -m1 '/nix/store/.*.drv')