0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

update shared path, add unrar

Browse source
This commit is contained in:
j 2019-01-29 16:11:35 +05:30
parent 8fdda01d4d
commit 3ec0930f52
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ctl
View file

@ -37,7 +37,7 @@ if [ ! -e "$PID" ]; then
fi fi
PLATFORM_PYTHON=3.4 PLATFORM_PYTHON=3.4
SHARED_PYTHON=3.4 SHARED_PYTHON=3.7
if [ -e "$BASE/platform_local" ]; then if [ -e "$BASE/platform_local" ]; then
export PLATFORM_ENV="$BASE/platform_local" export PLATFORM_ENV="$BASE/platform_local"
else else
@ -56,10 +56,16 @@ else
ARCH="_armv7l" ARCH="_armv7l"
fi fi
PLATFORM="linux$ARCH" PLATFORM="linux$ARCH"
if [ -e $BASE/platform_${PLATFORM}/lib/libunrar.so ]; then
export UNRAR_LIB_PATH="$BASE/platform_${PLATFORM}/lib/libunrar.so"
fi
fi fi
if [ $SYSTEM == "Darwin" ]; then if [ $SYSTEM == "Darwin" ]; then
PLATFORM="darwin64" PLATFORM="darwin64"
PLATFORM_PYTHON=3.7 PLATFORM_PYTHON=3.7
if [ -e $BASE/platform_${PLATFORM}/lib/libunrar.dylib ]; then
export UNRAR_LIB_PATH="$BASE/platform_${PLATFORM}/lib/libunrar.dylib"
fi
fi fi
export PLATFORM_ENV="$BASE/platform_${PLATFORM}" export PLATFORM_ENV="$BASE/platform_${PLATFORM}"
fi fi

3
oml/__main__.py
View file

@ -17,6 +17,9 @@ if sys.platform == 'win32':
site.addsitedir(site_packages) site.addsitedir(site_packages)
sys.path.append(join(base, 'platform_win32')) sys.path.append(join(base, 'platform_win32'))
os.environ['oxCACHE'] = join(base, 'data', 'ox') os.environ['oxCACHE'] = join(base, 'data', 'ox')
unrar_dll = join(base, 'platform_win32', 'unrar.dll')
if os.path.exists(unrar_dll):
os.environ['UNRAR_LIB_PATH'] = unrar_dll
import api import api
import commands import commands

1
requirements-shared.txt
View file

@ -10,3 +10,4 @@ pysocks
stem stem
sqlitedict==1.6.0 sqlitedict==1.6.0
zeroconf zeroconf
unrar