Skip to content

Commit 0dd568e

Browse files
committed
Replace GNU readlink in build scripts
1 parent 8e645fa commit 0dd568e

File tree

3 files changed

+12
-18
lines changed

3 files changed

+12
-18
lines changed

releaseScripts/default/makePackageConfig.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ echo "Using ${TOOLNAME} (${LCTOOLNAME}) as toolname"
3434

3535
# Additional files for all architectures
3636
ADDS=(
37-
"adds/LICENSE*"
37+
"adds/LICENSE"
38+
"adds/LICENSE.GPL"
39+
"adds/LICENSE.GPL.LESSER"
3840
"adds/z3-LICENSE"
3941
"adds/cvc4-LICENSE"
4042
"adds/mathsat-LICENSE"
@@ -135,11 +137,7 @@ exit_on_fail cp ${SETTINGS} "${CONFIGDIR}/."
135137

136138
# Copy all adds to target dir
137139
for add in "${ADDS[@]}" ; do
138-
if ! readlink -fe ${add} > /dev/null ; then
139-
echo "${add} does not exist, aborting..."
140-
exit 1
141-
fi
142-
exit_on_fail cp ${add} "${TARGETDIR}/"
140+
exit_on_fail cp "${add}" "${TARGETDIR}/"
143141
done
144142

145143
echo "Modifying Ultimate.py with version and toolname"

releaseScripts/default/makePackageReqCheck.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ echo "Using ${TOOLNAME} (${LCTOOLNAME}) as toolname"
3030

3131
# Additional files for all architectures
3232
ADDS=(
33-
"adds/LICENSE*"
33+
"adds/LICENSE"
34+
"adds/LICENSE.GPL"
35+
"adds/LICENSE.GPL.LESSER"
3436
"adds/z3-LICENSE"
3537
"adds/cvc4-LICENSE"
3638
"adds/mathsat-LICENSE"
@@ -98,9 +100,5 @@ exit_on_fail cp ${SETTINGS} "${CONFIGDIR}"/.
98100

99101
# Copy all adds to target dir
100102
for add in "${ADDS[@]}" ; do
101-
if ! readlink -fe ${add} > /dev/null ; then
102-
echo "${add} does not exist, aborting..."
103-
exit 1
104-
fi
105-
exit_on_fail cp ${add} "${TARGETDIR}/"
103+
exit_on_fail cp "${add}" "${TARGETDIR}/"
106104
done

releaseScripts/default/makePackageSmall.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ echo "Using ${TOOLNAME} (${LCTOOLNAME}) as toolname"
2929

3030
# Additional files for all architectures
3131
ADDS=(
32-
"adds/LICENSE*"
32+
"adds/LICENSE"
33+
"adds/LICENSE.GPL"
34+
"adds/LICENSE.GPL.LESSER"
3335
"adds/z3-LICENSE"
3436
"adds/cvc4-LICENSE"
3537
"adds/mathsat-LICENSE"
@@ -79,11 +81,7 @@ exit_on_fail cp -a ../../trunk/source/BA_SiteRepository/target/"${ARCHPATH}"/* "
7981

8082
# Copy all adds to target dir
8183
for add in "${ADDS[@]}" ; do
82-
if ! readlink -fe ${add} > /dev/null ; then
83-
echo "${add} does not exist, aborting..."
84-
exit 1
85-
fi
86-
exit_on_fail cp ${add} "${TARGETDIR}/"
84+
exit_on_fail cp "${add}" "${TARGETDIR}/"
8785
done
8886

8987
echo "Modifying Ultimate.py with version and toolname"

0 commit comments

Comments
 (0)