From 5751b23a97696cc663f75c8de5c3eaae4e658610 Mon Sep 17 00:00:00 2001 From: rustdesk Date: Sun, 18 Sep 2022 11:50:23 +0800 Subject: [PATCH] mv some linux package files to res --- PKGBUILD | 4 ++-- build.py | 22 +++++++++++-------- {DEBIAN => res/DEBIAN}/postinst | 0 {DEBIAN => res/DEBIAN}/postrm | 0 {DEBIAN => res/DEBIAN}/preinst | 0 {DEBIAN => res/DEBIAN}/prerm | 0 rustdesk.desktop => res/rustdesk.desktop | 0 rustdesk.service => res/rustdesk.service | 0 .../rustdesk.service.user | 0 rpm-suse.spec | 4 ++-- rpm.spec | 4 ++-- 11 files changed, 19 insertions(+), 15 deletions(-) rename {DEBIAN => res/DEBIAN}/postinst (100%) mode change 100755 => 100644 rename {DEBIAN => res/DEBIAN}/postrm (100%) mode change 100755 => 100644 rename {DEBIAN => res/DEBIAN}/preinst (100%) mode change 100755 => 100644 rename {DEBIAN => res/DEBIAN}/prerm (100%) mode change 100755 => 100644 rename rustdesk.desktop => res/rustdesk.desktop (100%) rename rustdesk.service => res/rustdesk.service (100%) rename rustdesk.service.user => res/rustdesk.service.user (100%) diff --git a/PKGBUILD b/PKGBUILD index 90eafe4ff..4d6057ab0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -28,7 +28,7 @@ package() { fi mkdir -p "${pkgdir}/usr/bin" pushd ${pkgdir} && ln -s /usr/lib/rustdesk/flutter_hbb usr/bin/rustdesk && popd - install -Dm 644 $HBB/rustdesk.service -t "${pkgdir}/usr/share/rustdesk/files" - install -Dm 644 $HBB/rustdesk.desktop -t "${pkgdir}/usr/share/rustdesk/files" + install -Dm 644 $HBB/res/rustdesk.service -t "${pkgdir}/usr/share/rustdesk/files" + install -Dm 644 $HBB/res/rustdesk.desktop -t "${pkgdir}/usr/share/rustdesk/files" install -Dm 644 $HBB/res/128x128@2x.png "${pkgdir}/usr/share/rustdesk/files/rustdesk.png" } diff --git a/build.py b/build.py index 522a74532..eadd547e5 100755 --- a/build.py +++ b/build.py @@ -122,7 +122,7 @@ def get_features(args): return features def generate_control_file(version): - control_file_path = "../DEBIAN/control" + control_file_path = "../res/DEBIAN/control" os.system('/bin/rm -rf %s' % control_file_path) content = """Package: rustdesk @@ -156,26 +156,26 @@ def build_flutter_deb(version): os.system( 'cp build/linux/x64/release/liblibrustdesk.so tmpdeb/usr/lib/rustdesk/librustdesk.so') os.system( - 'cp ../rustdesk.service tmpdeb/usr/share/rustdesk/files/systemd/') + 'cp ../res/rustdesk.service tmpdeb/usr/share/rustdesk/files/systemd/') os.system( - 'cp ../rustdesk.service.user tmpdeb/usr/share/rustdesk/files/systemd/') + 'cp ../res/rustdesk.service.user tmpdeb/usr/share/rustdesk/files/systemd/') os.system( 'cp ../res/128x128@2x.png tmpdeb/usr/share/rustdesk/files/rustdesk.png') os.system( - 'cp ../rustdesk.desktop tmpdeb/usr/share/applications/rustdesk.desktop') + 'cp ../res/rustdesk.desktop tmpdeb/usr/share/applications/rustdesk.desktop') os.system( 'cp ../res/com.rustdesk.RustDesk.policy tmpdeb/usr/share/polkit-1/actions/') os.system("echo \"#!/bin/sh\" >> tmpdeb/usr/share/rustdesk/files/polkit && chmod a+x tmpdeb/usr/share/rustdesk/files/polkit") os.system('mkdir -p tmpdeb/DEBIAN') generate_control_file(version) - os.system('cp -a ../DEBIAN/* tmpdeb/DEBIAN/') + os.system('cp -a ../res/DEBIAN/* tmpdeb/DEBIAN/') md5_file('usr/share/rustdesk/files/systemd/rustdesk.service') md5_file('usr/share/rustdesk/files/systemd/rustdesk.service.user') os.system('dpkg-deb -b tmpdeb rustdesk.deb;') os.system('/bin/rm -rf tmpdeb/') - os.system('/bin/rm -rf ../DEBIAN/control') + os.system('/bin/rm -rf ../res/DEBIAN/control') os.rename('rustdesk.deb', '../rustdesk-%s.deb' % version) os.chdir("..") @@ -301,10 +301,14 @@ def main(): os.system('dpkg-deb -R rustdesk.deb tmpdeb') os.system('mkdir -p tmpdeb/usr/share/rustdesk/files/systemd/') os.system( - 'cp rustdesk.service tmpdeb/usr/share/rustdesk/files/systemd/') + 'cp res/rustdesk.service tmpdeb/usr/share/rustdesk/files/systemd/') os.system( - 'cp rustdesk.service.user tmpdeb/usr/share/rustdesk/files/systemd/') - os.system('cp -a DEBIAN/* tmpdeb/DEBIAN/') + 'cp res/rustdesk.service.user tmpdeb/usr/share/rustdesk/files/systemd/') + os.system( + 'cp res/128x128@2x.png tmpdeb/usr/share/rustdesk/files/rustdesk.png') + os.system( + 'cp res/rustdesk.desktop tmpdeb/usr/share/applications/rustdesk.desktop') + os.system('cp -a res/DEBIAN/* tmpdeb/DEBIAN/') os.system('strip tmpdeb/usr/bin/rustdesk') os.system('mkdir -p tmpdeb/usr/lib/rustdesk') os.system('cp libsciter-gtk.so tmpdeb/usr/lib/rustdesk/') diff --git a/DEBIAN/postinst b/res/DEBIAN/postinst old mode 100755 new mode 100644 similarity index 100% rename from DEBIAN/postinst rename to res/DEBIAN/postinst diff --git a/DEBIAN/postrm b/res/DEBIAN/postrm old mode 100755 new mode 100644 similarity index 100% rename from DEBIAN/postrm rename to res/DEBIAN/postrm diff --git a/DEBIAN/preinst b/res/DEBIAN/preinst old mode 100755 new mode 100644 similarity index 100% rename from DEBIAN/preinst rename to res/DEBIAN/preinst diff --git a/DEBIAN/prerm b/res/DEBIAN/prerm old mode 100755 new mode 100644 similarity index 100% rename from DEBIAN/prerm rename to res/DEBIAN/prerm diff --git a/rustdesk.desktop b/res/rustdesk.desktop similarity index 100% rename from rustdesk.desktop rename to res/rustdesk.desktop diff --git a/rustdesk.service b/res/rustdesk.service similarity index 100% rename from rustdesk.service rename to res/rustdesk.service diff --git a/rustdesk.service.user b/res/rustdesk.service.user similarity index 100% rename from rustdesk.service.user rename to res/rustdesk.service.user diff --git a/rpm-suse.spec b/rpm-suse.spec index bc2a3f056..8b820beca 100644 --- a/rpm-suse.spec +++ b/rpm-suse.spec @@ -22,9 +22,9 @@ mkdir -p %{buildroot}/usr/lib/rustdesk/ mkdir -p %{buildroot}/usr/share/rustdesk/files/ install -m 755 $HBB/target/release/rustdesk %{buildroot}/usr/bin/rustdesk install $HBB/libsciter-gtk.so %{buildroot}/usr/lib/rustdesk/libsciter-gtk.so -install $HBB/rustdesk.service %{buildroot}/usr/share/rustdesk/files/ +install $HBB/res/rustdesk.service %{buildroot}/usr/share/rustdesk/files/ install $HBB/res/128x128@2x.png %{buildroot}/usr/share/rustdesk/files/rustdesk.png -install $HBB/rustdesk.desktop %{buildroot}/usr/share/rustdesk/files/ +install $HBB/res/rustdesk.desktop %{buildroot}/usr/share/rustdesk/files/ %files /usr/bin/rustdesk diff --git a/rpm.spec b/rpm.spec index 3a6eb57e0..e34997d2a 100644 --- a/rpm.spec +++ b/rpm.spec @@ -22,9 +22,9 @@ mkdir -p %{buildroot}/usr/lib/rustdesk/ mkdir -p %{buildroot}/usr/share/rustdesk/files/ install -m 755 $HBB/target/release/rustdesk %{buildroot}/usr/bin/rustdesk install $HBB/libsciter-gtk.so %{buildroot}/usr/lib/rustdesk/libsciter-gtk.so -install $HBB/rustdesk.service %{buildroot}/usr/share/rustdesk/files/ +install $HBB/res/rustdesk.service %{buildroot}/usr/share/rustdesk/files/ install $HBB/res/128x128@2x.png %{buildroot}/usr/share/rustdesk/files/rustdesk.png -install $HBB/rustdesk.desktop %{buildroot}/usr/share/rustdesk/files/ +install $HBB/res/rustdesk.desktop %{buildroot}/usr/share/rustdesk/files/ %files /usr/bin/rustdesk