Skip to content

Commit 62234da

Browse files
committed
file reordering
1 parent 09c882f commit 62234da

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

.dockerignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
.git
22
archive
3-
resources/app/perl-scripts/clock.pl
4-
resources/app/perl-scripts/input.pl
5-
resources/app/index-windows.html

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ peb.pro.*
1010

1111
peb
1212
peb.exe
13+
*.AppImage
1314

1415
test.db
1516

File renamed without changes.
File renamed without changes.

sdk/appimage-maker.sh

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ if [ $mode == "no-resources" ]; then
6767
fi
6868

6969
if [ $mode == "include-resources" ]; then
70-
package_desktop_file="$(ls ./resources/appimage/*.desktop)"
70+
package_desktop_file="$(ls ./resources/app/*.desktop)"
7171
if [ ! -e "$package_desktop_file" ]; then
7272
printf "\\nPackage .desktop file is missing!\\n"
7373
exit 1
@@ -86,12 +86,19 @@ if [ $mode == "include-resources" ]; then
8686
cp -f "$(pwd)/resources/app.png" "$(pwd)/$appimage_name.app/app.png"
8787
fi
8888

89-
if [ -e "$(pwd)/resources/appimage/$appimage_name.appdata.xml" ]; then
89+
if [ -e "$(pwd)/resources/app/$appimage_name.appdata.xml" ]; then
9090
mkdir -p "$(pwd)/$appimage_name.app/usr/share/metainfo"
91-
cp -f "$(pwd)/resources/appimage/$appimage_name.appdata.xml" "$(pwd)/$appimage_name.app/usr/share/metainfo/$appimage_name.appdata.xml"
91+
cp -f "$(pwd)/resources/app/$appimage_name.appdata.xml" "$(pwd)/$appimage_name.app/usr/share/metainfo/$appimage_name.appdata.xml"
9292
fi
9393

94-
rm -rf "$(pwd)/$appimage_name.app/resources/appimage"
94+
rm -f "$(pwd)/$appimage_name.app/resources/app/$appimage_name.desktop"
95+
rm -f "$(pwd)/$appimage_name.app/resources/app/$appimage_name.appdata.xml"
96+
97+
if [ $appimage_name == "peb-demo" ]; then
98+
rm -f "$(pwd)/$appimage_name.app/resources/app/index-windows.html"
99+
rm -f "$(pwd)/$appimage_name.app/resources/app/perl-scripts/clock.pl"
100+
rm -f "$(pwd)/$appimage_name.app/resources/app/perl-scripts/input.pl"
101+
fi
95102

96103
relocatable_perl="$(pwd)/resources/app/perl/bin/perl"
97104
compactor_script="$(pwd)/sdk/compactor.pl"

0 commit comments

Comments
 (0)