@@ -20,34 +20,33 @@ symlink.package() {
2020}
2121
2222symlink.bin_strict () {
23+ unset REPLY; REPLY=' no'
2324 local install_dir=" $1 " # e.g. "$BASALT_LOCAL_PROJECT_DIR/.basalt"
2425 local package_id=" $2 "
2526
2627 ensure.nonzero ' install_dir'
2728 ensure.nonzero ' package_id'
2829
29- local package_dir=" $BASALT_GLOBAL_DATA_DIR /store/packages/$site / $package @ $version "
30+ local package_dir=" $BASALT_GLOBAL_DATA_DIR /store/packages/$package_id "
3031 if [ -f " $package_dir /basalt.toml" ; then
3132 if util.get_toml_array " $package_dir /basalt.toml" ' binDirs' ; then
33+ REPLY=' yes'
34+
3235 if (( ${# REPLIES[@]} > 0 )) ; then
3336 mkdir -p " $install_dir /bin"
3437 fi
3538
39+ local dir=
3640 for dir in " ${REPLIES[@]} " ; do
3741 if [ -d " $package_dir /$dir " ; then
38- for target in " $package_dir /$dir " * ; do
39- local link_name=" $install_dir /bin/${target##*/ } "
40-
41- if [ -e " $link_name " ; then
42- print-indent ' Warning' " Executable file '${target##*/ } for package $package_id will clobber an identically-named file owned by a different package"
43- fi
44-
45- if ! ln -sf " $target " " $link_name " ; then
46- print.indent-die " Could not symlink file '${target##*/ } ' for package $site /$package @$version "
47- fi
48- done
42+ local file=
43+ for file in " $package_dir /$dir " * ; do
44+ symlink.bin_util_create_symlink " $install_dir " " $file "
45+ done ; unset file
46+ else
47+ newindent.warn " Package '$package_id ' improperly listed '$dir ' as a directory in 'binDirs'"
4948 fi
50- done
49+ done ; unset dir
5150 fi
5251 fi
5352}
@@ -59,102 +58,49 @@ symlink.bin_lenient() {
5958 ensure.nonzero ' install_dir'
6059 ensure.nonzero ' package_id'
6160
62- local -a bins=()
63- local remove_extensions=' no'
64- local package_dir=" $BASALT_GLOBAL_DATA_DIR /store/packages/$package_id "
65- if [ -f " $package_dir /basalt.toml" ; then
66- if util.get_toml_string " $package_dir /basalt.toml" ' binRemoveExtensions' ; then
67- if [ " $REPLY " = ' yes' ; then
68- remove_extensions=' yes'
69- fi
70- fi
71-
72- # TODO: cleanup?
73- if util.get_toml_array " $package_dir /basalt.toml" ' binDirs' ; then
74- local dir=
75- for dir in " ${REPLIES[@]} " ; do
76- if [ -d " $package_dir /$dir " ; then
77- for file in " $package_dir /$dir " * ; do
78- symlink.bin_lenient_util_create_symlink " $install_dir " " $file " " $remove_extensions "
79- done
80- fi
81- done
82- unset dir
83-
84- return
85- fi
86-
87- symlink.bin_lenient_util_heuristics " $install_dir " " $package_id " " $remove_extensions "
88- elif [ -f " $package_dir /package.sh" ; then
89- if util.extract_shell_variable " $package_dir /package.sh" ' REMOVE_EXTENSION' ; then
90- remove_extensions=" $REPLY "
91- fi
92-
93- if util.extract_shell_variable " $package_dir /package.sh" ' BINS' ; then
94- IFS=' :' read -ra bins <<< " $REPLY"
95-
96- local file=
97- for file in " ${bins[@]} " ; do
98- if [ -d " $package_dir /$file " ; then
99- die " Specified directory '$file ' in package.sh; only files are valid"
100- elif [ ! -f " $package_dir /$file " ; then
101- log.warn " Executable file '$file ' not found. Skipping"
102- else
103- symlink.bin_lenient_util_create_symlink " $install_dir " " $package_dir /$file " " $remove_extensions "
104- fi
105- done
106- unset file
107- else
108- symlink.bin_lenient_util_heuristics " $install_dir " " $package_id " " $remove_extensions "
109- fi
110- else
111- symlink.bin_lenient_util_heuristics " $install_dir " " $package_id " " $remove_extensions "
61+ symlink.bin_strict " $install_dir " " $package_id "
62+ if [ " $REPLY " = ' yes' ; then
63+ return
11264 fi
113- }
114-
115- # @description Use heuristics to locate and symlink the bin files. This is ran when
116- # the user does not supply any bin files/dirs with any config
117- # @arg $1 package
118- # @arg $2 Whether to remove extensions
119- symlink.bin_lenient_util_heuristics () {
120- local install_dir=" $1 "
121- local package_id=" $2 "
122- local remove_extensions=" $3 "
12365
66+ # USE HEURISTICS
12467 local package_dir=" $BASALT_GLOBAL_DATA_DIR /store/packages/$package_id "
12568 if [ -d " $package_dir /bin" ; then
69+ mkdir -p " $install_dir /bin" # TODO: do this only once
70+ local file=
12671 for file in " $package_dir " * ; do
127- symlink.bin_lenient_util_create_symlink " $install_dir " " $file " " $remove_extensions "
128- done
72+ if [ -f " $file " ; then
73+ symlink.bin_util_create_symlink " $install_dir " " $file "
74+ fi
75+ done ; unset file
12976 elif [ -d " $package_dir /bins" ; then
77+ mkdir -p " $install_dir /bin" # TODO: do this only once
78+ local file=
13079 for file in " $package_dir " * ; do
131- symlink.bin_lenient_util_create_symlink " $install_dir " " $file " " $remove_extensions "
132- done
80+ if [ -f " $file " ; then
81+ symlink.bin_util_create_symlink " $install_dir " " $file "
82+ fi
83+ done ; unset file
13384 else
85+ mkdir -p " $install_dir /bin" # TODO: do this only once
86+ local file=
13487 for file in " $package_dir " * ; do
13588 if [ -f " $file " && [ -x " $file " ; then
136- symlink.bin_lenient_util_create_symlink " $install_dir " " $file " " $remove_extensions "
89+ symlink.bin_util_create_symlink " $install_dir " " $file "
13790 fi
138- done
91+ done ; unset file
13992 fi
14093}
14194
14295# @description Symlink the bin file to the correct location or
14396# remove the symlink
14497# @arg $1 The full path of the executable
14598# @arg $2 Whether to remove extensions
146- symlink.bin_lenient_util_create_symlink () {
99+ symlink.bin_util_create_symlink () {
147100 local install_dir=" $1 "
148101 local full_bin_file=" $2 "
149- local remove_extensions=" $3 "
150102
151103 local bin_name=" ${full_bin_file##*/ } "
152-
153- if [[ " ${remove_extensions:- no} " == @ (yes| true) ]]; then
154- bin_name=" ${bin_name%% .* } "
155- fi
156-
157- mkdir -p " $install_dir /bin" # TODO: do this only once
158104 if [ -L " $install_dir /bin/$bin_name " ; then
159105 log.error " Skipping '$bin_name ' since an existing symlink with the same name already exists"
160106 else
0 commit comments