Update to 4.2.2, remove docker-entrypoint.sh and encapsulation.sh, use Python3_Crosss_Wrapper

This commit is contained in:
yoshiko2
2020-12-25 12:11:54 +08:00
parent b8d5aa2beb
commit 38739feee2
5 changed files with 20 additions and 22 deletions

View File

@@ -130,7 +130,7 @@ def create_data_and_move_with_custom_number(file_path: str, c: config.Config, cu
if __name__ == '__main__':
version = '4.2.1'
version = '4.2.2'
# Parse command line args
single_file_path, config_file, custom_number, auto_exit = argparse_function(version)

View File

@@ -1,15 +0,0 @@
#!/bin/sh
git fetch --all
git reset --hard origin/master
git pull
apt update
apt upgrade -y
pip3 install --upgrade -r requirements.txt
make
cd bin
version=$(./AV_Data_Capture --version)
zip AV_Data_Capture-CLI-$(echo $version)-$(uname)-$(dpkg --print-architecture).zip AV_Data_Capture config.ini
mv *zip /avdc_bin

View File

@@ -1,6 +0,0 @@
pyinstaller --onefile AV_Data_Capture.py --hidden-import ADC_function.py --hidden-import core.py
cp config.ini dist/
find . -name '*.pyc' -delete
find . -name '__pycache__' -type d | xargs rm -fr
find . -name '.pytest_cache' -type d | xargs rm -fr
rm -rf build/

4
wrapper/FreeBSD.sh Executable file
View File

@@ -0,0 +1,4 @@
pkg install python37 py37-requests py37-pip py37-lxml py37-pillow py37-cloudscraper py37-pysocks git zip py37-pyinstaller py37-beautifulsoup448
pip install pyquery
pyinstaller --onefile AV_Data_Capture.py --hidden-import ADC_function.py --hidden-import core.py
cp config.ini ./dist

15
wrapper/Linux.sh Executable file
View File

@@ -0,0 +1,15 @@
if ['$(dpkg --print-architecture)' != 'amd64'] || ['$(dpkg --print-architecture)' != 'i386']; then
apt install python3 python3-pip git sudo libxml2-dev libxslt-dev build-essential wget nano libcmocka-dev libcmocka0 -y
apt install zlib* libjpeg-dev -y
wget https://files.pythonhosted.org/packages/82/96/21ba3619647bac2b34b4996b2dbbea8e74a703767ce24192899d9153c058/pyinstaller-4.0.tar.gz
tar -zxvf pyinstaller-4.0.tar.gz
cd pyinstaller-4.0/bootloader
sed -i "s/ '-Werror',//" wscript
python3 ./waf distclean all
cd ../
python3 setup.py install
cd ../
fi
pip3 install -r requirements.txt
pyinstaller --onefile AV_Data_Capture.py --hidden-import ADC_function.py --hidden-import core.py
cp config.ini ./dist