diff --git a/packaging/ubuntu/lbry b/packaging/ubuntu/lbry index b22309c45..a139556cf 100755 --- a/packaging/ubuntu/lbry +++ b/packaging/ubuntu/lbry @@ -7,7 +7,7 @@ LBRYCRDDIR="$HOME/.lbrycrd" LBRYCRDCONF="$LBRYCRDDIR/lbrycrd.conf" if [ ! -f "$LBRYCRDDPATHCONF" ]; then - echo "/usr/local/bin/lbrycrdd" > "$LBRYCRDDPATHCONF" + echo "/usr/bin/lbrycrdd" > "$LBRYCRDDPATHCONF" fi if [ ! -f "$LBRYCRDCONF" ]; then diff --git a/packaging/ubuntu/postinst_append b/packaging/ubuntu/postinst_append index e082aad14..48e54f006 100755 --- a/packaging/ubuntu/postinst_append +++ b/packaging/ubuntu/postinst_append @@ -1,28 +1,15 @@ ( -sleep 4 +if hash zenity 2>/dev/null; then + sleep 3 -zenity --question --text="LBRY Installed\n\nRun LBRY now?" --title="LBRY Installed" --ok-label=" Yes" \ - --cancel-label=" No" --icon-name="system-software-install" + zenity --info --icon-name="system-software-install" \ + --text="\ +LBRY Installed\n\nLBRY has been installed.\n\n\ +Please start LBRY by running lbry from the command line or selecting LBRY from the application menu.\n\n\ +If you need help or have any questions, join us on Slack (https://slack.lbry.io) or email hello@lbry.io.\ +" -case $? in - 0) RUN=1 # yes - ;; - 1) RUN=0 # no - ;; - *) RUN=0 # timeout or escape or whatever - ;; -esac - -if [ $RUN = 1 ]; then - /bin/su - "$(logname)" -c 'xdg-open "lbry://lbry"' -else - zenity --info --text="LBRY Installed\n\nNo problem. You can run LBRY later by going to - -lbry://lbry - -in your browser." --title="LBRY Installed" --icon-name="system-software-install" fi - ) & diff --git a/packaging/ubuntu/ubuntu_package_setup.sh b/packaging/ubuntu/ubuntu_package_setup.sh index 3ea6aa463..59d9ecfc7 100755 --- a/packaging/ubuntu/ubuntu_package_setup.sh +++ b/packaging/ubuntu/ubuntu_package_setup.sh @@ -178,6 +178,9 @@ addfile "$PACKAGING_DIR/bins/lbrycrd-cli" usr/bin/lbrycrd-cli # add postinstall script cat "$PACKAGING_DIR/postinst_append" >> control/postinst +# change package name from lbrynet to lbry +sed -i 's/^Package: lbrynet/Package: lbry/' control/control + # repackage .deb $SUDO chown -R root:root control data tar -czf control.tar.gz -C control . diff --git a/setup.py b/setup.py index ce96e06a8..12dc36dc9 100644 --- a/setup.py +++ b/setup.py @@ -31,8 +31,8 @@ requires = ['pycrypto', 'twisted', 'miniupnpc', 'yapsy', 'seccure', setup(name='lbrynet', description='A fully-decentralized content marketplace', version=__version__, - maintainer='Jimmy Kiselak', - maintainer_email='jimmy@lbry.io', + maintainer='Alex Grintsvayg', + maintainer_email='grin@lbry.io', packages=find_packages(base_dir), install_requires=requires, entry_points={'console_scripts': console_scripts},