Simplify deb build

RetGal · Sep 8, 2024 · 1548501 · 1548501
1 parent 054db4c
commit 1548501
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 48 deletions.
diff --git a/build.xml b/build.xml
@@ -65,7 +65,6 @@
 		<copy file="${dir.build}/dayon.jar" todir="${dir.dist}"/>
 		<copy todir="${dir.dist}">
 			<fileset dir="${dir.res}">
-				<exclude name="deb/"/>
 				<exclude name="snap/"/>
 				<exclude name="jre/"/>
 				<exclude name="jrex/"/>
@@ -79,7 +78,6 @@
 		<copy file="${dir.build}/dayon.jar" todir="${dir.ppa}"/>
 		<copy todir="${dir.ppa}">
 			<fileset dir="${dir.res}">
-				<exclude name="deb/"/>
 				<exclude name="snap/"/>
 				<exclude name="jre/"/>
 				<exclude name="jrex/"/>

diff --git a/pom.xml b/pom.xml
@@ -153,8 +153,12 @@
                                     <target>dayon_assisted.sh</target>
                                 </fileSet>
                                 <fileSet>
-                                    <source>${basedir}/resources/deb/</source>
-                                    <target>deb</target>
+                                    <source>${basedir}/debian/dayon_assistant.desktop</source>
+                                    <target>dayon_assistant.desktop</target>
+                                </fileSet>
+                                <fileSet>
+                                    <source>${basedir}/debian/dayon_assisted.desktop</source>
+                                    <target>dayon_assisted.desktop</target>
                                 </fileSet>
                             </fileSets>
                         </configuration>
@@ -435,7 +439,6 @@
                                             <directory>resources</directory>
                                             <include>**/*</include>
                                             <excludes>
-                                                <exclude>deb/</exclude>
                                                 <exclude>jrex/</exclude>
                                                 <exclude>snap/</exclude>
                                             </excludes>
@@ -505,7 +508,6 @@
                                             <directory>resources</directory>
                                             <include>**/*</include>
                                             <excludes>
-                                                <exclude>deb/</exclude>
                                                 <exclude>jre/</exclude>
                                                 <exclude>jrex/legal/</exclude>
                                                 <exclude>snap/</exclude>
@@ -575,7 +577,6 @@
                                             <directory>resources</directory>
                                             <include>**/*</include>
                                             <excludes>
-                                                <exclude>deb/</exclude>
                                                 <exclude>jre/</exclude>
                                                 <exclude>jrex/legal/</exclude>
                                                 <exclude>snap/</exclude>

diff --git a/resources/deb/dayon_assistant.desktop b/resources/deb/dayon_assistant.desktop
diff --git a/resources/deb/dayon_assisted.desktop b/resources/deb/dayon_assisted.desktop
diff --git a/src/main/deb/postinst b/src/main/deb/postinst
@@ -1,4 +1,5 @@
-cp ${config.installDir}/deb/*.desktop /usr/share/applications/
+mv ${config.installDir}/*.desktop /usr/share/applications/
+mv ${config.installDir}/dayon.png usr/share/icons
 chmod +x ${config.installDir}/*.sh
 ln -s ${config.installDir}/dayon_assisted.sh /usr/bin/dayon_assisted
 ln -s ${config.installDir}/dayon_assistant.sh /usr/bin/dayon_assistant
diff --git a/src/main/deb/postrm b/src/main/deb/postrm
@@ -1,4 +1,5 @@
 rm -f /usr/share/applications/dayon_assistant.desktop
 rm -f /usr/share/applications/dayon_assisted.desktop
+rm -f /usr/share/icons/dayon.png
 rm -f /usr/bin/dayon_assisted
 rm -f /usr/bin/dayon_assistant