Skip to content

Commit 4e229f7

Browse files
committed
Prevent looping
1 parent c292e70 commit 4e229f7

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

platform/windows/create-license-directory.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,20 @@ get_dependencies ( ) {
3434
copy_license_directory ( ) {
3535
ORIGINAL_DIRECTORY="$(pacman -Ql ${1}| grep '/licenses/*/$'|cut -f2 -d ' ')"
3636
ORIGINAL_DIRECTORY="${ORIGINAL_DIRECTORY::-1}"
37+
DIRECTORY_NAME="$(echo ${ORIGINAL_DIRECTORY}|rev|cut -f1 -d'/'|rev)"
3738
if [ -n "${ORIGINAL_DIRECTORY}" ] && [ -d "${ORIGINAL_DIRECTORY}" ]; then
38-
if [ ! -d "${LICENSE_DIRECTORY}/${1}" ]; then
39-
echo "Adding license for ${1} to ${LICENSE_DIRECTORY}"
39+
if [ ! -d "${LICENSE_DIRECTORY}/${DIRECTORY_NAME}" ]; then
40+
echo "Adding license for ${1} to ${LICENSE_DIRECTORY}/${DIRECTORY_NAME}"
41+
else
42+
echo "Directory for ${1}, ${LICENSE_DIRECTORY}/${DIRECTORY_NAME}, already exists"
43+
return
4044
fi
4145
cp -rf "${ORIGINAL_DIRECTORY}" "${LICENSE_DIRECTORY}/"
4246
for dependency in $(get_dependencies "${1}"); do
4347
if [ "${dependency}" == "None" ]; then
4448
continue
4549
fi
46-
if [ ! -d "${LICENSE_DIRECTORY}/${dependency}" ]; then
47-
echo "Found dependency ${dependency} for ${1}"
48-
fi
50+
echo "Found dependency ${dependency} for ${1}"
4951
copy_license_directory "${dependency}"
5052
done
5153
else

0 commit comments

Comments
 (0)