fix lbry symlink, fix icon path, add .desktop file to bumpversion

This commit is contained in:
Alex Grintsvayg 2016-07-06 14:13:11 -04:00
parent 7dbec9d395
commit f83c892b13
4 changed files with 16 additions and 4 deletions

View file

@ -6,3 +6,5 @@ message = Bump version: {current_version} -> {new_version}
[bumpversion:file:lbrynet/__init__.py]
[bumpversion:file:packaging/ubuntu/lbry.desktop]

View file

@ -40,7 +40,17 @@ urlencode() {
done
}
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# find true dir of executable
SOURCE="${BASH_SOURCE[0]}"
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
SOURCE="$(readlink "$SOURCE")"
[[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
done
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
if [ -z "$(pgrep lbrynet-daemon)" ]; then
echo "running lbrynet-daemon..."
$DIR/lbrynet-daemon --branch="$WEB_UI_BRANCH" &

View file

@ -1,8 +1,8 @@
[Desktop Entry]
Version=0.2.2
Version=0.3.4
Name=LBRY
Comment=The world's first user-owned content marketplace
Icon=/usr/share/python/lbrynet/lbrynet/lbrynet_gui/lbry.png
Icon=lbry
GenericName=Content Marketplace
Categories=Network;Internet;Filesharing
Terminal=false

View file

@ -148,7 +148,7 @@ function addfile() {
FILE="$1"
TARGET="$2"
mkdir -p "$(dirname "data/$TARGET")"
cp "$FILE" "data/$TARGET"
cp -d "$FILE" "data/$TARGET"
echo "$(md5sum "data/$TARGET" | cut -d' ' -f1) $TARGET" >> control/md5sums
}