external/VirtScreen
1
0
Fork 0
mirror of https://github.com/kbumsik/VirtScreen.git synced 2025-02-12 11:21:53 +00:00
Code Issues Releases Wiki Activity

Travis: Fixed bash interpreter

Browse source
This commit is contained in:
Bumsik Kim 2018-06-18 03:11:21 -04:00
parent 7ebe935805
commit d1563d14bc
No known key found for this signature in database
GPG key ID: E31041C8EC5B01C6
6 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -14,6 +14,7 @@ deploy:
secure: zFbsCIKcsvWU/Yc+9k294Qj8QY48VlkV8DSScP5gz6dQegeUSaSHI/YafherkFQ0B03bIY8yc7roMtDo7HAkEnPptjFhdUiOFI11+xDVb3s7Y8Ek2nV3znQzdtR4CR/94l3in6R3DH+eNA6+6Je/NIWLdVcvRX07RBSfBVdPmnsAyAD9KNTsl8Q4c20HgtLNxfWv2s5eCyD+heCTLYrErEZKZ5vYeeANmWomHvT2ED/4QerpBP8wkh59QXD1S79CF7oyq6X173ZJUQVxdBP+OSXt/mDBAoqf+TV6okawRZn48JluvCWAJ7BceX7t9emd1rVI/s8t3wCP+eMcmNn5g/6UJaCPnTJ5YplTuUWRc63UFSkE0AY8WYcRlrz+/OiXYgQ8LMXfN23aWgarHCbS2vHR3Afu9gpLCoKucr36hKhs3zfjJzVLFFW16mnbaTFcBzfDDRpkvOANB1aZwGVRFpTIWIMjkn0+lxWTC/moIJvQlfRPsC4dN5cDAilRQlguHzayebtGE8X0PuIe9A8bkET3V/y+KPnQiSJ7J+5PNoDSdqRAE4IKvVOLEyHtlqBVkvIHKnugUnWPIZ21gm5RemMEj9/YGa8Efwz7PIKtJJ3kFMGDYKVlIKyB+rg/TFWNdo6jjevnWM6y4SfVI3kFyjA+mp31o6nshrQy0zVQpd8= secure: zFbsCIKcsvWU/Yc+9k294Qj8QY48VlkV8DSScP5gz6dQegeUSaSHI/YafherkFQ0B03bIY8yc7roMtDo7HAkEnPptjFhdUiOFI11+xDVb3s7Y8Ek2nV3znQzdtR4CR/94l3in6R3DH+eNA6+6Je/NIWLdVcvRX07RBSfBVdPmnsAyAD9KNTsl8Q4c20HgtLNxfWv2s5eCyD+heCTLYrErEZKZ5vYeeANmWomHvT2ED/4QerpBP8wkh59QXD1S79CF7oyq6X173ZJUQVxdBP+OSXt/mDBAoqf+TV6okawRZn48JluvCWAJ7BceX7t9emd1rVI/s8t3wCP+eMcmNn5g/6UJaCPnTJ5YplTuUWRc63UFSkE0AY8WYcRlrz+/OiXYgQ8LMXfN23aWgarHCbS2vHR3Afu9gpLCoKucr36hKhs3zfjJzVLFFW16mnbaTFcBzfDDRpkvOANB1aZwGVRFpTIWIMjkn0+lxWTC/moIJvQlfRPsC4dN5cDAilRQlguHzayebtGE8X0PuIe9A8bkET3V/y+KPnQiSJ7J+5PNoDSdqRAE4IKvVOLEyHtlqBVkvIHKnugUnWPIZ21gm5RemMEj9/YGa8Efwz7PIKtJJ3kFMGDYKVlIKyB+rg/TFWNdo6jjevnWM6y4SfVI3kFyjA+mp31o6nshrQy0zVQpd8=
file: file:
- "package/debian/build/virtscreen_$TRAVIS_TAG-1_all.deb" - "package/debian/build/virtscreen_$TRAVIS_TAG-1_all.deb"
skip_cleanup: true
on: on:
tags: true tags: true
repo: kbumsik/VirtScreen repo: kbumsik/VirtScreen

5
Dockerfile
View file

@ -12,10 +12,7 @@ RUN apt-get update && \
ln /usr/bin/pip3 /usr/bin/pip && \ ln /usr/bin/pip3 /usr/bin/pip && \
rm -rf /var/cache/apt/archives/*.deb && \ rm -rf /var/cache/apt/archives/*.deb && \
pip install virtualenv && \ pip install virtualenv && \
pip install --upgrade pip setuptools && \ pip install --upgrade pip setuptools
useradd -c Builder -m -U builder
USER builder
# Get Miniconda and make it the main Python interpreter # Get Miniconda and make it the main Python interpreter
RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \ RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \

33
Makefile
View file

@ -2,17 +2,19 @@
# for python packaging reference. # for python packaging reference.
DOCKER_NAME=kbumsik/virtscreen DOCKER_NAME=kbumsik/virtscreen
DOCKER_RUN=docker run -v $(shell pwd)/package/debian:/app $(DOCKER_NAME)
DOCKER_RUN_TTY=docker run --interactive --tty -v $(shell pwd)/package/debian:/app $(DOCKER_NAME)
.PHONY: .PHONY:
python-wheel: python-wheel:
/usr/bin/python3 setup.py bdist_wheel --universal python3 setup.py bdist_wheel --universal
python-install: python-install:
/usr/bin/pip3 install . --user pip3 install . --user
python-uninstall: python-uninstall:
/usr/bin/pip3 uninstall virtscreen pip3 uninstall virtscreen
python-clean: python-clean:
rm -rf build dist virtscreen.egg-info virtscreen/qml/*.qmlc rm -rf build dist virtscreen.egg-info virtscreen/qml/*.qmlc
@ -27,7 +29,7 @@ docker-build:
docker build -f Dockerfile -t $(DOCKER_NAME) . docker build -f Dockerfile -t $(DOCKER_NAME) .
docker: docker:
docker run --interactive --tty -v $(shell pwd)/package/debian:/app $(DOCKER_NAME) /bin/bash $(DOCKER_RUN_TTY) /bin/bash
docker-rm: docker-rm:
docker image rm -f $(DOCKER_NAME) docker image rm -f $(DOCKER_NAME)
@ -41,24 +43,27 @@ docker-push:
# For Debian packaging, https://www.debian.org/doc/manuals/debmake-doc/ch08.en.html#setup-py # For Debian packaging, https://www.debian.org/doc/manuals/debmake-doc/ch08.en.html#setup-py
deb-make: deb-make:
docker run -v $(shell pwd)/package/debian:/app $(DOCKER_NAME) /app/debmake.sh $(DOCKER_RUN) /app/debmake.sh
deb-build: deb-clean deb-make deb-build: deb-make
package/debian/copy_debian.sh $(DOCKER_RUN) /app/copy_debian.sh
docker run -v $(shell pwd)/package/debian:/app $(DOCKER_NAME) /app/debuild.sh $(DOCKER_RUN) /app/debuild.sh
deb-contents: deb-contents:
docker run -v $(shell pwd)/package/debian:/app $(DOCKER_NAME) /app/contents.sh $(DOCKER_RUN) /app/contents.sh
deb-env-make: deb-env-make:
docker run -v $(shell pwd)/package/debian:/app $(DOCKER_NAME) /app/debmake.sh virtualenv $(DOCKER_RUN) /app/debmake.sh virtualenv
deb-env-build: deb-clean deb-env-make deb-env-build: deb-env-make
package/debian/copy_debian.sh virtualenv $(DOCKER_RUN) /app/copy_debian.sh virtualenv
docker run -v $(shell pwd)/package/debian:/app $(DOCKER_NAME) /app/debuild.sh virtualenv $(DOCKER_RUN) /app/debuild.sh virtualenv
deb-chown:
$(DOCKER_RUN) chown -R $(shell id -u):$(shell id -u) /app/build
deb-clean: deb-clean:
rm -rf package/debian/build $(DOCKER_RUN) rm -rf /app/build
# For AUR: https://wiki.archlinux.org/index.php/Python_package_guidelines # For AUR: https://wiki.archlinux.org/index.php/Python_package_guidelines
# and: https://wiki.archlinux.org/index.php/Creating_packages # and: https://wiki.archlinux.org/index.php/Creating_packages

6
package/debian/copy_debian.sh
View file

@ -4,8 +4,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source $DIR/_common.sh source $DIR/_common.sh
if [ $1 = "virtualenv" ]; then if [ $1 = "virtualenv" ]; then
cp $DIR/control.virtualenv $DIR/build/virtscreen-$PKGVER/debian/control cp -f $DIR/control.virtualenv $DIR/build/virtscreen-$PKGVER/debian/control
cp $DIR/README.Debian $DIR/build/virtscreen-$PKGVER/debian/ cp -f $DIR/README.Debian $DIR/build/virtscreen-$PKGVER/debian/
else else
cp $DIR/{control,rules,README.Debian} $DIR/build/virtscreen-$PKGVER/debian cp -f $DIR/{control,rules,README.Debian} $DIR/build/virtscreen-$PKGVER/debian
fi fi

4
package/debian/debmake.sh
View file

@ -5,7 +5,7 @@ source _common.sh
mkdir build mkdir build
cd build cd build
# Download # Download
wget https://github.com/kbumsik/VirtScreen/archive/$PKGVER.tar.gz wget -q https://github.com/kbumsik/VirtScreen/archive/$PKGVER.tar.gz
tar -xzmf $PKGVER.tar.gz tar -xzmf $PKGVER.tar.gz
# rename packages # rename packages
mv VirtScreen-$PKGVER virtscreen-$PKGVER mv VirtScreen-$PKGVER virtscreen-$PKGVER
@ -13,7 +13,7 @@ mv $PKGVER.tar.gz virtscreen-$PKGVER.tar.gz
cd virtscreen-$PKGVER cd virtscreen-$PKGVER
if [ $1 = "virtualenv" ]; then if [ $1 = "virtualenv" ]; then
cp ../../Makefile.virtualenv Makefile cp -f ../../Makefile.virtualenv Makefile
debmake -b':sh' debmake -b':sh'
else else
debmake -b':py3' debmake -b':py3'

7
package/update_version.sh
View file

@ -1,4 +1,4 @@
#!/bin/env bash #!/bin/bash
# Get parameters. Just return 0 if no parameter passed # Get parameters. Just return 0 if no parameter passed
if [ -n "$1" ]; then if [ -n "$1" ]; then
@ -44,9 +44,10 @@ build_arch () {
build_debian () { build_debian () {
make -C $ROOT deb-env-build make -C $ROOT deb-env-build
make -C $ROOT deb-chown
} }
override_version override_version
build_pypi # build_pypi
build_arch # build_arch
build_debian build_debian