修复小问题

This commit is contained in:
gfdgd xi 2023-07-11 22:32:28 +08:00
parent b31c4bf134
commit 9fd8f5144f
2 changed files with 16 additions and 13 deletions

View File

@ -28,26 +28,28 @@ do
fi fi
fi fi
done done
if [[ -L /usr/lib64 ]] && [[ ! -d "$CURRENT_DIR/usr/lib64" ]]; then if [[ -d /usr/lib64 ]] && [[ ! -d "$CURRENT_DIR/usr/lib64" ]]; then
mkdir -p "$CURRENT_DIR/usr/lib64" mkdir -p "$CURRENT_DIR/usr/lib64"
fi fi
for libr in `ls /usr/lib64/ld*.so*` if [[ -d /usr/lib64/ ]]; then
do for libr in `ls /usr/lib64/ld*.so*`
if [[ -f $libr ]]; then do
if [[ ! -f "$CURRENT_DIR/$libr" ]]; then if [[ -f $libr ]]; then
systemNeedCommand="$systemNeedCommand --ro-bind $libr $libr " if [[ ! -f "$CURRENT_DIR/$libr" ]]; then
touch "$CURRENT_DIR/$libr"
else
if [[ ! -s "$CURRENT_DIR/$libr" ]]; then
systemNeedCommand="$systemNeedCommand --ro-bind $libr $libr " systemNeedCommand="$systemNeedCommand --ro-bind $libr $libr "
touch "$CURRENT_DIR/$libr"
else
if [[ ! -s "$CURRENT_DIR/$libr" ]]; then
systemNeedCommand="$systemNeedCommand --ro-bind $libr $libr "
fi
fi fi
fi fi
fi done
done fi
if [[ ! -d "$CURRENT_DIR/usr/lib/locale" ]]; then if [[ ! -d "$CURRENT_DIR/usr/lib/locale" ]]; then
systemNeedCommand="$systemNeedCommand --ro-bind /usr/lib/locale /usr/lib/locale " systemNeedCommand="$systemNeedCommand --ro-bind /usr/lib/locale /usr/lib/locale "
fi fi
echo $systemNeedCommand
if [[ ! -d "$CURRENT_DIR/usr/lib64" ]]; then if [[ ! -d "$CURRENT_DIR/usr/lib64" ]]; then
bwrap --dev-bind / / \ bwrap --dev-bind / / \
--bind "$CURRENT_DIR/usr/lib" /lib \ --bind "$CURRENT_DIR/usr/lib" /lib \

View File

@ -3076,10 +3076,11 @@ if os.path.exists(f"{programPath}/WineLib/usr"):
global diyRunnerLib global diyRunnerLib
action = QtWidgets.QAction(f"{name}") action = QtWidgets.QAction(f"{name}")
mapLink.append(action) mapLink.append(action)
action.triggered.connect(lambda: AddRunnerLib(int(str(number)))) action.triggered.connect(lambda: DelRunnerLib(int(str(number))))
diyRunnerLib.addAction(action) diyRunnerLib.addAction(action)
def DelRunnerLib(number): def DelRunnerLib(number):
os.system(f"rm -rf '{libPathList[number]}'") os.system(f"rm -rf '{libPathList[number]}'")
QtWidgets.QMessageBox.information(window, "提示", "删除完成!")
mapLink[number].setDisabled(True) mapLink[number].setDisabled(True)
for libPath in [f"{programPath}/WineLib/usr/lib", f"{programPath}/WineLib/usr/lib64"]: for libPath in [f"{programPath}/WineLib/usr/lib", f"{programPath}/WineLib/usr/lib64"]:
for i in os.listdir(libPath): for i in os.listdir(libPath):