Skip to content

Commit 8c3c7e4

Browse files
committed
Fix building Flatpak in Ubuntu 22.04 in WSL2
- Use LF line ending for Linux scripts even on Windows - Better handling of paths that include spaces - Avoid new f-string syntax to support Python 3.10 - Replace shell substitution syntax that dash doesn't support
1 parent f4cc876 commit 8c3c7e4

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Auto detect text files and perform LF normalization
22
* text=auto
3+
*.sh text eol=lf
4+
/resources/linux/* text eol=lf
35

46
# Custom for Visual Studio
57
*.cs diff=csharp

scripts/build_flatpak.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ then
1010
BRANCH_NAME="$(git rev-parse --abbrev-ref HEAD)"
1111
DESCRIPTION="$(git describe --tags --long --abbrev=7)"
1212
PACKAGE_FILENAME="loot_${DESCRIPTION}_${BRANCH_NAME}.flatpak"
13-
PACKAGE_FILENAME="${PACKAGE_FILENAME//[\/<>\"|]/_}"
13+
PACKAGE_FILENAME="$(echo $PACKAGE_FILENAME | sed 's/[\/<>\"|]/_/g')"
1414
fi
1515

1616
cd build

0 commit comments

Comments
 (0)