File tree Expand file tree Collapse file tree 2 files changed +10
-7
lines changed Expand file tree Collapse file tree 2 files changed +10
-7
lines changed Original file line number Diff line number Diff line change @@ -11,7 +11,11 @@ for fn in ${files[@]}; do
11
11
cp -f " $fn " " $fn .bak"
12
12
fi
13
13
14
- sed -i " s/$IMAGE_VERSION_MARKER /$IMAGE_SET_VERSION /" " $fn "
14
+ if [[ " $OSTYPE " == " darwin" * ]]; then
15
+ sed -i " " " s/$IMAGE_VERSION_MARKER /$IMAGE_SET_VERSION /" " $fn " || echo " Modify failed."
16
+ else
17
+ sed -i " s/$IMAGE_VERSION_MARKER /$IMAGE_SET_VERSION /" " $fn "
18
+ fi
15
19
16
20
if [[ $2 == " --dev" ]]; then
17
21
docker build --progress plain --no-cache -t boeegh/dotnet-runx:dev . || echo " Docker build failed."
Original file line number Diff line number Diff line change 4
4
appDll=$( grep -so -E ' ([^\"]*)\.dll' web.config)
5
5
if [ ! $appDll ]
6
6
then
7
- # app: find any executable, assume main dll has same name
8
- app=$( find . -type f -perm -u+x)
9
- if [ $app ]
10
- then
7
+ # app: find first executable, assume main dll has same name
8
+ app=$( find . -type f -perm -u+x -print | head -n 1)
9
+ if [ ! -z " $app " ]; then
11
10
appDll=" $app .dll"
12
11
fi
13
12
fi
14
13
15
14
# todo: support for enforcing ownership of non-root user?
16
15
17
16
# no dll found?
18
- if [ ! $appDll ] || [ ! -f $appDll ]
17
+ if [ ! " $appDll " ] || [ ! -f " $appDll " ]
19
18
then
20
- notFound=$( [ $appDll ] && echo " Identified main dll as $appDll , however it was not found." )
19
+ notFound=$( [ " $appDll " ] && echo " Identified main dll as $appDll , however it was not found." )
21
20
echo -e " Unable to autostart application dll (alpine will not execute binary). $notFound \n"
22
21
echo " Listing files present in $PWD :"
23
22
ls .
You can’t perform that action at this time.
0 commit comments