From e2b3c7046e2abcbfab068c0079b1e04b35ad9371 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Sat, 1 Jun 2019 18:16:09 -0600 Subject: [PATCH] Depend on nw.js externally for debian package --- debian/DEBIAN/control | 5 +++-- debian/usr/bin/notepost | 3 +-- .../usr/share/applications/notepost.desktop | 2 +- scripts/debian_build.sh | 19 +++++++++---------- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/debian/DEBIAN/control b/debian/DEBIAN/control index efad48b..3827ac0 100644 --- a/debian/DEBIAN/control +++ b/debian/DEBIAN/control @@ -1,8 +1,9 @@ Package: notepost -Version: 1.2.0 +Version: 1.2.0-1 Maintainer: Netsyms Technologies Section: web Homepage: https://netsyms.com/apps/notepost Priority: optional +Depends: nw.js-normal | nw.js Description: Desktop client for the NotePost notetaking webapp. -Architecture: i386 +Architecture: all diff --git a/debian/usr/bin/notepost b/debian/usr/bin/notepost index 1e62078..ef9c537 100755 --- a/debian/usr/bin/notepost +++ b/debian/usr/bin/notepost @@ -1,3 +1,2 @@ #!/bin/sh -cd /usr/lib/notepost -./notepost +nwjs /usr/share/notepost diff --git a/debian/usr/share/applications/notepost.desktop b/debian/usr/share/applications/notepost.desktop index f0ff3ae..021bd9a 100755 --- a/debian/usr/share/applications/notepost.desktop +++ b/debian/usr/share/applications/notepost.desktop @@ -3,7 +3,7 @@ Name=NotePost Version=1.0 Exec=/usr/bin/notepost Comment=Launch the NotePost client -Icon=/usr/lib/notepost/logo.svg +Icon=/usr/share/notepost/logo.svg Type=Application Terminal=false StartupNotify=true diff --git a/scripts/debian_build.sh b/scripts/debian_build.sh index 715a1b8..1f71617 100644 --- a/scripts/debian_build.sh +++ b/scripts/debian_build.sh @@ -1,11 +1,10 @@ #!/bin/bash -# $1 is the binary location, $2 is the arch, $3 is the svg icon -mkdir out -sed -i '/Architecture:/d' debian/DEBIAN/control -echo "Architecture: $2" >> debian/DEBIAN/control -rm -rf debian/usr/lib/notepost -mv "$1com.netsyms.NotePostApp" "$1notepost" -mkdir -p debian/usr/lib -rsync -rv "$1" debian/usr/lib/notepost -cp "$3" debian/usr/lib/notepost/logo.svg -dpkg-deb -b debian "out/notepost_$2.deb" +# $1 is the app source location, $2 is the svg icon +mkdir -p out +rm -rf debian/usr/share/notepost +mkdir -p debian/usr/share/notepost +mkdir -p debian/usr/share/doc/notepost +rsync -rv "$1" debian/usr/share/notepost +cp debian/DEBIAN/copyright debian/usr/share/doc/notepost/ +cp "$2" debian/usr/share/notepost/logo.svg +dpkg-deb -b debian "out/notepost_1.2.0-1_all.deb"