File tree Expand file tree Collapse file tree 2 files changed +6
-4
lines changed Expand file tree Collapse file tree 2 files changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -6,6 +6,8 @@ source=$(dirname $(readlink -f $0))
6
6
# Source the common utils
7
7
. $source /src/common-utils/_zz_colors.sh
8
8
9
+ alias zz_log=$source /src/common-utils/_zz_logs.sh
10
+
9
11
# Prepare for local installation by creating a temporary directory and linking common utils
10
12
find $source /src/common-utils/ -type f -name " _*.sh" -exec echo {} \; -exec chmod +x {} \; | while read file; do
11
13
ln -sf $file $source /src/common-utils/$( basename $file | sed ' s/^_//;s/.sh$//' )
@@ -23,6 +25,8 @@ eval $(
23
25
help
24
26
)
25
27
28
+ zz_log i " Installing devcontainer/features"
29
+
26
30
# If 'all' argument is provided, set stubs and features to install all default features
27
31
if [ -n " $all " ]; then
28
32
echo " ${Yellow} Add default features${End} "
@@ -88,7 +92,7 @@ if [ -n "$features" ]; then
88
92
alias install-feature=$( dirname $0 ) /src/common-utils/_install-feature.sh
89
93
90
94
# Check if the script is running inside a container
91
- if [ " $CODESPACES " != " true" ] && [ " $REMOTE_CONTAINERS " != " true" ]; then
95
+ if [ " $CODESPACES " != " true" ] && [ " $REMOTE_CONTAINERS " != " true" ] && [ -z " $DEV_CONTAINER_FILE_PATH " ] ; then
92
96
93
97
echo " ${Red} You are not in a container${End} "
94
98
Original file line number Diff line number Diff line change @@ -23,11 +23,9 @@ export source=${source:-/usr/local/share/$feature}
23
23
export tabSize=4
24
24
25
25
zz_log i " Configure feature <{Purple $feature }>"
26
+ zz_log - " In {U $( pwd) }"
26
27
zz_log - " From {U $source }"
27
28
28
- # Go to the module root
29
- cd " $( git rev-parse --show-toplevel) " > /dev/null
30
-
31
29
# Ensure the source directory exists
32
30
if [ ! -d $source ]; then
33
31
zz_log e " Source directory <$source > does not exist"
You can’t perform that action at this time.
0 commit comments