fix "launch as root" bug, update package name and maintainer
This commit is contained in:
parent
c58fc0781c
commit
74bbde0c34
4 changed files with 14 additions and 24 deletions
|
@ -7,7 +7,7 @@ LBRYCRDDIR="$HOME/.lbrycrd"
|
||||||
LBRYCRDCONF="$LBRYCRDDIR/lbrycrd.conf"
|
LBRYCRDCONF="$LBRYCRDDIR/lbrycrd.conf"
|
||||||
|
|
||||||
if [ ! -f "$LBRYCRDDPATHCONF" ]; then
|
if [ ! -f "$LBRYCRDDPATHCONF" ]; then
|
||||||
echo "/usr/local/bin/lbrycrdd" > "$LBRYCRDDPATHCONF"
|
echo "/usr/bin/lbrycrdd" > "$LBRYCRDDPATHCONF"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -f "$LBRYCRDCONF" ]; then
|
if [ ! -f "$LBRYCRDCONF" ]; then
|
||||||
|
|
|
@ -1,28 +1,15 @@
|
||||||
|
|
||||||
(
|
(
|
||||||
|
|
||||||
sleep 4
|
if hash zenity 2>/dev/null; then
|
||||||
|
sleep 3
|
||||||
|
|
||||||
zenity --question --text="<span size=\"xx-large\">LBRY Installed</span>\n\nRun LBRY now?" --title="LBRY Installed" --ok-label=" Yes" \
|
zenity --info --icon-name="system-software-install" \
|
||||||
--cancel-label=" No" --icon-name="system-software-install"
|
--text="\
|
||||||
|
<span size=\"xx-large\">LBRY Installed</span>\n\nLBRY has been installed.\n\n\
|
||||||
|
Please start LBRY by running <b><tt>lbry</tt></b> from the command line or selecting <b>LBRY</b> from the application menu.\n\n\
|
||||||
|
If you need help or have any questions, join us on Slack (<tt>https://slack.lbry.io</tt>) or email <tt>hello@lbry.io</tt>.\
|
||||||
|
"
|
||||||
|
|
||||||
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="<span size=\"xx-large\">LBRY Installed</span>\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
|
fi
|
||||||
|
|
||||||
) &
|
) &
|
||||||
|
|
|
@ -178,6 +178,9 @@ addfile "$PACKAGING_DIR/bins/lbrycrd-cli" usr/bin/lbrycrd-cli
|
||||||
# add postinstall script
|
# add postinstall script
|
||||||
cat "$PACKAGING_DIR/postinst_append" >> control/postinst
|
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
|
# repackage .deb
|
||||||
$SUDO chown -R root:root control data
|
$SUDO chown -R root:root control data
|
||||||
tar -czf control.tar.gz -C control .
|
tar -czf control.tar.gz -C control .
|
||||||
|
|
4
setup.py
4
setup.py
|
@ -31,8 +31,8 @@ requires = ['pycrypto', 'twisted', 'miniupnpc', 'yapsy', 'seccure',
|
||||||
setup(name='lbrynet',
|
setup(name='lbrynet',
|
||||||
description='A fully-decentralized content marketplace',
|
description='A fully-decentralized content marketplace',
|
||||||
version=__version__,
|
version=__version__,
|
||||||
maintainer='Jimmy Kiselak',
|
maintainer='Alex Grintsvayg',
|
||||||
maintainer_email='jimmy@lbry.io',
|
maintainer_email='grin@lbry.io',
|
||||||
packages=find_packages(base_dir),
|
packages=find_packages(base_dir),
|
||||||
install_requires=requires,
|
install_requires=requires,
|
||||||
entry_points={'console_scripts': console_scripts},
|
entry_points={'console_scripts': console_scripts},
|
||||||
|
|
Loading…
Add table
Reference in a new issue