From 02e21e40c3888050020e176133958e54a3f6fce1 Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Mon, 24 Jul 2023 01:01:34 +0800
Subject: [PATCH] fix-23
---
src/opt/uos-packaging-tools/directory-create | 4 +---
src/opt/uos-packaging-tools/just-X-me | 5 ++---
src/opt/uos-packaging-tools/just-install-me | 9 ++++++---
src/opt/uos-packaging-tools/just-repack-me | 5 ++---
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/opt/uos-packaging-tools/directory-create b/src/opt/uos-packaging-tools/directory-create
index 0b280a2..548a1d8 100755
--- a/src/opt/uos-packaging-tools/directory-create
+++ b/src/opt/uos-packaging-tools/directory-create
@@ -8,10 +8,8 @@ fi
for deb_file in "$@"
do
-if [[ $deb_file == file://* ]]; then
- # 如果是，移除 'file://' 部分并输出结果
deb_file="${deb_file#file://}"
-fi
+
cd "$(dirname "$deb_file")"
# 获取deb包的包名和架构
diff --git a/src/opt/uos-packaging-tools/just-X-me b/src/opt/uos-packaging-tools/just-X-me
index a39f792..0febf1e 100755
--- a/src/opt/uos-packaging-tools/just-X-me
+++ b/src/opt/uos-packaging-tools/just-X-me
@@ -14,10 +14,9 @@ unpack_package() {
}
for arg in "$@"; do
-if [[ $arg == file://* ]]; then
- # 如果是，移除 'file://' 部分并输出结果
+
arg="${arg#file://}"
-fi
+
unpack_package "$arg"
done
diff --git a/src/opt/uos-packaging-tools/just-install-me b/src/opt/uos-packaging-tools/just-install-me
index bee7367..824e9d5 100755
--- a/src/opt/uos-packaging-tools/just-install-me
+++ b/src/opt/uos-packaging-tools/just-install-me
@@ -16,10 +16,9 @@ if [ -e /usr/local/bin/ssaudit ];then
for DEBPATH in "$@"
do
-if [[ $DEBPATH == file://* ]]; then
- # 如果是，移除 'file://' 部分并输出结果
+
DEBPATH="${DEBPATH#file://}"
-fi
+
DEBPATH=$(realpath "$DEBPATH")
notify-send "正在使用ssaudit安装 $(dpkg-deb -f "$DEBPATH" Package)，请稍候...." -i /usr/share/icons/uos-packaging-tools.png
@@ -36,6 +35,10 @@ else
for DEBPATH in "$@"
do
+if [[ $DEBPATH == file://* ]]; then
+ # 如果是，移除 'file://' 部分并输出结果
+ DEBPATH="${DEBPATH#file://}"
+fi
DEBPATH=$(realpath "$DEBPATH")
notify-send "正在使用apt安装 $(dpkg-deb -f "$DEBPATH" Package)，请稍候...." -i /usr/share/icons/uos-packaging-tools.png
apt install "$DEBPATH" --reinstall -y
diff --git a/src/opt/uos-packaging-tools/just-repack-me b/src/opt/uos-packaging-tools/just-repack-me
index f6e8eaa..da2f209 100755
--- a/src/opt/uos-packaging-tools/just-repack-me
+++ b/src/opt/uos-packaging-tools/just-repack-me
@@ -5,10 +5,9 @@ OUTPATH=""
for DEBPATH in "$@"
do
-if [[ $DEBPATH == file://* ]]; then
- # 如果是，移除 'file://' 部分并输出结果
+
DEBPATH="${DEBPATH#file://}"
-fi
+
rm -rf $TMPDIR/unpack-dir
mkdir -p "$TMPDIR/unpack-dir"
cd "$TMPDIR/unpack-dir"