Skip to content

Commit

Permalink
Downgrading pyqt to 5.12; postinst script fix; (#134)
Browse files Browse the repository at this point in the history
  • Loading branch information
rllola authored Oct 23, 2019
1 parent 38728b4 commit 6470081
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ install:
- cd ./ZeroNet
- pip3 install -r requirements.txt
- cd ..
- pip3 install pyinstaller PyQt5-sip PyQt5 PyQtWebEngine
- pip3 install pyinstaller PyQt5-sip PyQt5==5.12.3 PyQtWebEngine==5.12.1
- python3 scripts/bump_version.py
- cat src/version.py
script:
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform:
image: Visual Studio 2017

environment:
matrix:
matrix:
- PYTHON: "C:\\Python37-x64"
PATH: C:\Program Files (x86)\NSIS\;%PATH%

Expand All @@ -18,7 +18,7 @@ init:
- cmd: copy C:\windows\system32\ssleay32.dll C:\Qt\5.12\msvc2017_64\bin
- SET PATH=%PYTHON%;%PYTHON%\Scripts;C:\Qt\5.12\msvc2017_64\bin;%PATH%
- python -m pip install --upgrade pip
- python -m pip install pyinstaller msgpack gevent pypiwin32 PyQt5-sip PyQt5 PyQtWebEngine
- python -m pip install pyinstaller msgpack gevent pypiwin32 PyQt5-sip PyQt5==5.12.3 PyQtWebEngine==5.12.1

install:
- ps: Start-FileDownload 'https://nsis.sourceforge.io/mediawiki/images/4/4a/AccessControl.zip'
Expand Down
4 changes: 2 additions & 2 deletions pkg-debian/DEBIAN/postinst
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ if [[ ! -z ${SUDO_USER+x} ]]; then

cat > $HOME/.zeronet/zeronet.conf << EOF
[global]
data_dir = $HOME/.zeronet
log_dir = $HOME/.zeronet/log
data_dir = $HOME/.zeronet
log_dir = $HOME/.zeronet/log
EOF

chown $SUDO_USER:$SUDO_USER $HOME/.zeronet/zeronet.conf
Expand Down

0 comments on commit 6470081

Please sign in to comment.