mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
chore: fix small issues in deployment scripts and add debug mode
This commit is contained in:
parent
66fe7f2852
commit
b7e6d4fadf
|
@ -22,8 +22,15 @@
|
|||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
# THE SOFTWARE.
|
||||
|
||||
|
||||
+set -exo pipefail
|
||||
# usage: ./appimage/build-appimage.sh [Debug]
|
||||
#
|
||||
# If [Debug] is set to "Debug" the container will run in interactive mode and
|
||||
# stay open to poke around in the filesystem.
|
||||
|
||||
readonly DEBUG="$1"
|
||||
|
||||
# Fail out on error
|
||||
set -exo pipefail
|
||||
|
||||
# This script should be run from the root of the repository
|
||||
|
||||
|
@ -38,12 +45,24 @@ fi
|
|||
|
||||
mkdir -p ./output
|
||||
|
||||
docker run --rm \
|
||||
-v $PWD:/qtox \
|
||||
-v $PWD/output:/output \
|
||||
debian:stretch-slim \
|
||||
/bin/bash -c "/qtox/appimage/build.sh"
|
||||
|
||||
if [ "$DEBUG" == "Debug" ]
|
||||
then
|
||||
echo "Execute: /qtox/appimage/build.sh to start the build script"
|
||||
echo "Execute: exit to leave the container"
|
||||
|
||||
docker run --rm -it \
|
||||
-v $PWD:/qtox \
|
||||
-v $PWD/output:/output \
|
||||
debian:stretch-slim \
|
||||
/bin/bash
|
||||
else
|
||||
docker run --rm \
|
||||
-v $PWD:/qtox \
|
||||
-v $PWD/output:/output \
|
||||
debian:stretch-slim \
|
||||
/bin/bash -c "/qtox/appimage/build.sh"
|
||||
fi
|
||||
|
||||
# use the version number in the name when building a tag on Travis CI
|
||||
if [ -n "$TRAVIS_TAG" ]
|
||||
then
|
||||
|
|
|
@ -6,6 +6,16 @@
|
|||
#
|
||||
# This script should be run from the root of the repository
|
||||
|
||||
# usage: ./flatpak/build-flatpak.sh [Debug]
|
||||
#
|
||||
# If [Debug] is set to "Debug" the container will run in interactive mode and
|
||||
# stay open to poke around in the filesystem.
|
||||
|
||||
readonly DEBUG="$1"
|
||||
|
||||
# Fail out on error
|
||||
set -exo pipefail
|
||||
|
||||
if [ ! -f ./flatpak/build-flatpak.sh ]; then
|
||||
echo ""
|
||||
echo "You are attempting to run the build-flatpak.sh from a wrong directory."
|
||||
|
@ -17,11 +27,23 @@ fi
|
|||
|
||||
mkdir -p ./output
|
||||
|
||||
docker run --rm --privileged \
|
||||
-v $PWD:/qtox \
|
||||
-v $PWD/output:/output \
|
||||
debian:stretch-slim \
|
||||
/bin/bash -c "/qtox/flatpak/build.sh"
|
||||
if [ "$DEBUG" == "Debug" ]
|
||||
then
|
||||
echo "Execute: /qtox/appimage/build.sh to start the build script"
|
||||
echo "Execute: exit to leave the container"
|
||||
|
||||
docker run --rm --privileged -it \
|
||||
-v $PWD:/qtox \
|
||||
-v $PWD/output:/output \
|
||||
debian:stretch-slim \
|
||||
/bin/bash
|
||||
else
|
||||
docker run --rm --privileged \
|
||||
-v $PWD:/qtox \
|
||||
-v $PWD/output:/output \
|
||||
debian:stretch-slim \
|
||||
/bin/bash -c "/qtox/flatpak/build.sh"
|
||||
fi
|
||||
|
||||
# use the version number in the name when building a tag on Travis CI
|
||||
if [ -n "$TRAVIS_TAG" ]
|
||||
|
|
|
@ -26,7 +26,7 @@ echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/source
|
|||
|
||||
# Get packages
|
||||
apt-get update
|
||||
apt-get install $APT_FLAGS ca-certificates git elfutils wget xz-utils patch
|
||||
apt-get install $APT_FLAGS ca-certificates git elfutils wget xz-utils patch bzip2
|
||||
|
||||
# install recent flatpak packages
|
||||
apt-get install $APT_FLAGS -t stretch-backports flatpak flatpak-builder
|
||||
|
|
Loading…
Reference in New Issue
Block a user