summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTing-Wei Lan <lantw44@gmail.com>2022-01-31 01:25:46 +0800
committerTing-Wei Lan <lantw44@gmail.com>2022-01-31 01:25:46 +0800
commit864349f7aaf4969f24b095f8a660e8edc87a230e (patch)
tree87410093846fe15a8a1788d1260b2cde5fb57b70
parentff9100c182c622a25b8629999bc59dfba4f7bd10 (diff)
downloadwspkg-data-864349f7aaf4969f24b095f8a660e8edc87a230e.tar.gz
wspkg-data-864349f7aaf4969f24b095f8a660e8edc87a230e.tar.zst
wspkg-data-864349f7aaf4969f24b095f8a660e8edc87a230e.zip
wscommon: Add the official 7-Zip for Linux (console version)
p7zip has known vulnerabilities and is unmaintained.
-rw-r--r--wsarch/wsarch.pkg1
-rw-r--r--wsbsd/wsbsd.pkg1
-rw-r--r--wscommon.h4
-rw-r--r--wslinux/wslinux.pkg1
4 files changed, 5 insertions, 2 deletions
diff --git a/wsarch/wsarch.pkg b/wsarch/wsarch.pkg
index c79926f..e0257d0 100644
--- a/wsarch/wsarch.pkg
+++ b/wsarch/wsarch.pkg
@@ -421,6 +421,7 @@
#define ACK ack
#define RIPGREP ripgrep
#define SILVER_SEARCHER the_silver_searcher
+#define SEVEN_ZIP p7zip 7-zip
// Video
#define MPLAYER mplayer smplayer gnome-mplayer
diff --git a/wsbsd/wsbsd.pkg b/wsbsd/wsbsd.pkg
index 997b889..2cfe0bd 100644
--- a/wsbsd/wsbsd.pkg
+++ b/wsbsd/wsbsd.pkg
@@ -409,6 +409,7 @@
#define ACK p5-ack
#define RIPGREP ripgrep
#define SILVER_SEARCHER the_silver_searcher
+#define SEVEN_ZIP p7zip 7-zip
// Video
#define MPLAYER mplayer gnome-mplayer mencoder
diff --git a/wscommon.h b/wscommon.h
index 1f7c619..eb43dfa 100644
--- a/wscommon.h
+++ b/wscommon.h
@@ -395,8 +395,8 @@ rlwrap
SHELLCHECK
//added by b03902074@csie.ntu.edu.tw
ACK RIPGREP SILVER_SEARCHER jq
-// PTT 上 oxen 在看板 b07902xxx 提到工作站缺少這個套件
-p7zip
+// PTT 上 oxen 在看板 b07902xxx 提到工作站沒有安裝 p7zip
+SEVEN_ZIP
#endif
// Video
diff --git a/wslinux/wslinux.pkg b/wslinux/wslinux.pkg
index f0c8a8d..e6332fb 100644
--- a/wslinux/wslinux.pkg
+++ b/wslinux/wslinux.pkg
@@ -425,6 +425,7 @@
#define ACK ack-grep
#define RIPGREP NULL
#define SILVER_SEARCHER silversearcher-ag
+#define SEVEN_ZIP p7zip 7zip
// Video
#define MPLAYER mplayer