From 14c835b41e771db160ee60268d46d255de183677 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Wed, 4 Jan 2017 09:51:15 -0500 Subject: [PATCH] fix linux packaging to work with new install paths --- packaging/ubuntu/lbry-init.conf | 2 +- packaging/ubuntu/lbry.desktop | 4 ++-- packaging/ubuntu/ubuntu_package_setup.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/ubuntu/lbry-init.conf b/packaging/ubuntu/lbry-init.conf index c1e192deb..8d0e36d25 100644 --- a/packaging/ubuntu/lbry-init.conf +++ b/packaging/ubuntu/lbry-init.conf @@ -8,4 +8,4 @@ stop on runlevel [016] respawn respawn limit 5 20 -exec /usr/share/python/lbrynet/bin/lbrynet-daemon +exec /opt/venvs/lbrynet/bin/lbrynet-daemon \ No newline at end of file diff --git a/packaging/ubuntu/lbry.desktop b/packaging/ubuntu/lbry.desktop index 66ea2e078..5a0e1fe09 100644 --- a/packaging/ubuntu/lbry.desktop +++ b/packaging/ubuntu/lbry.desktop @@ -10,10 +10,10 @@ Type=Application MimeType=x-scheme-handler/lbry; -Exec=/usr/share/python/lbrynet/bin/lbry %U +Exec=/usr/bin/lbry %U Actions=StopDaemon; [Desktop Action StopDaemon] Name=Stop Daemon -Exec=/usr/share/python/lbrynet/bin/stop-lbrynet-daemon +Exec=/opt/venvs/lbrynet/bin/stop-lbrynet-daemon diff --git a/packaging/ubuntu/ubuntu_package_setup.sh b/packaging/ubuntu/ubuntu_package_setup.sh index e5e25432d..002a311de 100755 --- a/packaging/ubuntu/ubuntu_package_setup.sh +++ b/packaging/ubuntu/ubuntu_package_setup.sh @@ -170,7 +170,7 @@ addfile "$PACKAGING_DIR/icons/lbry256.png" usr/share/icons/hicolor/256x256/apps/ addfile "$PACKAGING_DIR/lbry.desktop" usr/share/applications/lbry.desktop # add lbry executable script -BINPATH=usr/share/python/lbrynet/bin +BINPATH=opt/venvs/lbrynet/bin addfile "$PACKAGING_DIR/lbry" "$BINPATH/lbry" # symlink scripts into /usr/bin