Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

update script to build against diff web ui branches

Browse source
This commit is contained in:
Alex Grintsvayg 2016-05-06 14:30:00 -04:00
parent c22eed9109
commit 9a655988dd
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packaging/ubuntu/lbry
View file

@ -2,6 +2,8 @@
set -euo pipefail set -euo pipefail
WEB_UI_BRANCH='master'
urlencode() { urlencode() {
local LANG=C local LANG=C
local length="${#1}" local length="${#1}"
@ -17,7 +19,7 @@ urlencode() {
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
if [ -z "$(pgrep lbrynet-daemon)" ]; then if [ -z "$(pgrep lbrynet-daemon)" ]; then
echo "running lbrynet-daemon..." echo "running lbrynet-daemon..."
$DIR/lbrynet-daemon & $DIR/lbrynet-daemon --branch="$WEB_UI_BRANCH" &
sleep 3 # let the daemon load before connecting sleep 3 # let the daemon load before connecting
fi fi

11
packaging/ubuntu/ubuntu_package_setup.sh
View file

@ -3,11 +3,12 @@
# Tested on fresh Ubuntu 14.04 install. # Tested on fresh Ubuntu 14.04 install.
# wget https://raw.githubusercontent.com/lbryio/lbry/master/packaging/ubuntu/ubuntu_package_setup.sh # wget https://raw.githubusercontent.com/lbryio/lbry/master/packaging/ubuntu/ubuntu_package_setup.sh
# bash ubuntu_package_setup.sh master # bash ubuntu_package_setup.sh [BRANCH] [WEB-UI-BRANCH]
set -euo pipefail set -euo pipefail
BRANCH=${1:-master} BRANCH=${1:-master}
WEB_UI_BRANCH=${2:-}
BUILD_DIR="lbry-build-$(date +%Y%m%d-%H%M%S)" BUILD_DIR="lbry-build-$(date +%Y%m%d-%H%M%S)"
mkdir "$BUILD_DIR" mkdir "$BUILD_DIR"
@ -44,6 +45,13 @@ mkdir control data
tar -xvzf control.tar.gz --directory control tar -xvzf control.tar.gz --directory control
tar -xvJf data.tar.xz --directory data tar -xvJf data.tar.xz --directory data
PACKAGING_DIR='lbry/packaging/ubuntu'
# set web ui branch
if [ -z "$WEB_UI_BRANCH" ]; then
sed -i "s/^WEB_UI_BRANCH='[^']\+'/WEB_UI_BRANCH='$WEB_UI_BRANCH'/" "$PACKAGING_DIR/lbry"
fi
# add files # add files
function addfile() { function addfile() {
FILE="$1" FILE="$1"
@ -52,7 +60,6 @@ function addfile() {
cp "$FILE" "data/$TARGET" cp "$FILE" "data/$TARGET"
echo "$(md5sum "data/$TARGET" | cut -d' ' -f1) $TARGET" >> control/md5sums echo "$(md5sum "data/$TARGET" | cut -d' ' -f1) $TARGET" >> control/md5sums
} }
PACKAGING_DIR='lbry/packaging/ubuntu'
addfile "$PACKAGING_DIR/lbry" usr/share/python/lbrynet/bin/lbry addfile "$PACKAGING_DIR/lbry" usr/share/python/lbrynet/bin/lbry
addfile "$PACKAGING_DIR/lbry.desktop" usr/share/applications/lbry.desktop addfile "$PACKAGING_DIR/lbry.desktop" usr/share/applications/lbry.desktop
#addfile lbry/packaging/ubuntu/lbry-init.conf etc/init/lbry.conf #addfile lbry/packaging/ubuntu/lbry-init.conf etc/init/lbry.conf