pyrox.dev
Merge pull request #241117 from foo-dogsquared/guile-setup-hook-cleanup
guile: cleanup setup hook
authored by
Weijia Wang
and committed by
GitHub
56d5a48b
053e9ef8
+1
-1
pkgs/development/interpreters/guile/setup-hook-1.8.sh
+1
-1
pkgs/development/interpreters/guile/setup-hook-1.8.sh
+6
-6
pkgs/development/interpreters/guile/setup-hook-2.0.sh
+6
-6
pkgs/development/interpreters/guile/setup-hook-2.0.sh
···
1
1
addGuileLibPath () {
2
2
if test -d "$1/share/guile/site/2.0"; then
3
-
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.0"
4
-
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.0"
3
+
addToSearchPath GUILE_LOAD_PATH "$1/share/guile/site/2.0"
4
+
addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/share/guile/site/2.0"
5
5
elif test -d "$1/share/guile/site"; then
6
-
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
7
-
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"
6
+
addToSearchPath GUILE_LOAD_PATH "$1/share/guile/site"
7
+
addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/share/guile/site"
8
8
fi
9
9
10
10
if test -d "$1/lib/guile/2.0/ccache"; then
11
-
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.0/ccache"
11
+
addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/lib/guile/2.0/ccache"
12
12
fi
13
13
14
14
if test -d "$1/lib/guile/2.0/site-ccache"; then
15
-
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.0/site-ccache"
15
+
addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/lib/guile/2.0/site-ccache"
16
16
fi
17
17
}
18
18
+6
-6
pkgs/development/interpreters/guile/setup-hook-2.2.sh
+6
-6
pkgs/development/interpreters/guile/setup-hook-2.2.sh
···
1
1
addGuileLibPath () {
2
2
if test -d "$1/share/guile/site/2.2"; then
3
-
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.2"
4
-
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.2"
3
+
addToSearchPath GUILE_LOAD_PATH "$1/share/guile/site/2.2"
4
+
addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/share/guile/site/2.2"
5
5
elif test -d "$1/share/guile/site"; then
6
-
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
7
-
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"
6
+
addToSearchPath GUILE_LOAD_PATH "$1/share/guile/site"
7
+
addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/share/guile/site"
8
8
fi
9
9
10
10
if test -d "$1/lib/guile/2.2/ccache"; then
11
-
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.2/ccache"
11
+
addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/lib/guile/2.2/ccache"
12
12
fi
13
13
14
14
if test -d "$1/lib/guile/2.2/site-ccache"; then
15
-
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.2/site-ccache"
15
+
addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/lib/guile/2.2/site-ccache"
16
16
fi
17
17
}
18
18
+9
-9
pkgs/development/interpreters/guile/setup-hook-3.0.sh
+9
-9
pkgs/development/interpreters/guile/setup-hook-3.0.sh
···
1
1
addGuileLibPath () {
2
2
if test -d "$1/share/guile/site/3.0"; then
3
-
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site/3.0"
4
-
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/3.0"
5
-
export GUILE_EXTENSIONS_PATH="${GUILE_EXTENSIONS_PATH-}${GUILE_EXTENSIONS_PATH:+:}$1/share/guile/site/3.0"
3
+
addToSearchPath GUILE_LOAD_PATH "$1/share/guile/site/3.0"
4
+
addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/share/guile/site/3.0"
5
+
addToSearchPath GUILE_EXTENSIONS_PATH "$1/share/guile/site/3.0"
6
6
elif test -d "$1/share/guile/site"; then
7
-
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
8
-
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"
9
-
export GUILE_EXTENSIONS_PATH="${GUILE_EXTENSIONS_PATH-}${GUILE_EXTENSIONS_PATH:+:}$1/share/guile/site"
7
+
addToSearchPath GUILE_LOAD_PATH "$1/share/guile/site"
8
+
addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/share/guile/site"
9
+
addToSearchPath GUILE_EXTENSIONS_PATH "$1/share/guile/site"
10
10
fi
11
11
12
12
if test -d "$1/lib/guile/3.0/ccache"; then
13
-
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/3.0/ccache"
13
+
addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/lib/guile/3.0/ccache"
14
14
fi
15
15
16
16
if test -d "$1/lib/guile/3.0/site-ccache"; then
17
-
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/3.0/site-ccache"
17
+
addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/lib/guile/3.0/site-ccache"
18
18
fi
19
19
20
20
if test -d "$1/lib/guile/3.0/extensions"; then
21
-
export GUILE_EXTENSIONS_PATH="${GUILE_EXTENSIONS_PATH-}${GUILE_EXTENSIONS_PATH:+:}$1/lib/guile/3.0/extensions"
21
+
addToSearchPath GUILE_EXTENSIONS_PATH "$1/lib/guile/3.0/extensions"
22
22
fi
23
23
}
24
24