Skip to content

Commit 61e14f9

Browse files
committed
docker: Switch from p7zip to 7zip
Signed-off-by: Sushrut1101 <guptasushrut@gmail.com>
1 parent 52a9854 commit 61e14f9

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

arch/install_packages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pacman -Sy --needed --noconfirm \
3535

3636
# More Packages
3737
pacman -Sy --needed --noconfirm \
38-
tmate tmux screen mlocate unace unrar p7zip \
38+
tmate tmux screen mlocate unace unrar \
3939
sharutils uudeview arj cabextract file-roller \
4040
dtc brotli axel gawk detox clang gcc gcc-libs \
4141
flatpak libxcrypt-compat

fedora/install_packages.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ dnf upgrade -y
1919
# Install basic packages
2020
dnf install -y \
2121
sudo git nano neofetch tmate aria2 rsync rclone \
22-
python python2 zip unzip p7zip p7zip-plugins jq \
22+
python python2 zip unzip jq neovim pipx \
2323
unrar python3-pip tmate make cmake clang glibc \
2424
bc ag unace sharutils uudeview arj cabextract \
2525
file-roller dtc brotli axel detox cpio lz4 \
2626
python3-devel xz-devel speedtest-cli zsh \
27-
util-linux-user neovim pipx
27+
util-linux-user
2828

2929
# Use pipx instead of pip
3030
ln -sf /usr/bin/pipx /usr/local/bin/pip

scripts/android_tools_setup.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ PROJECT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
1111

1212
# Install some packages
1313
if [[ -e "/usr/bin/apt-get" ]]; then
14-
sudo apt-get install -y aria2 arj brotli cabextract cmake device-tree-compiler gcc g++ git liblz4-tool liblzma-dev libtinyxml2-dev lz4 mpack openjdk-11-jdk p7zip-full p7zip-rar python3 python3-pip rar sharutils unace unrar unzip uudeview xz-utils zip zlib1g-dev
14+
sudo apt-get install -y aria2 arj brotli cabextract cmake device-tree-compiler gcc g++ git liblz4-tool liblzma-dev libtinyxml2-dev lz4 mpack openjdk-11-jdk python3 python3-pip rar sharutils unace unrar unzip uudeview xz-utils zip zlib1g-dev
1515
elif [[ -e "/usr/bin/pacman" ]]; then
16-
sudo pacman -Syu --needed --noconfirm android-tools aria2 arj brotli cabextract cmake dtc gcc git lz4 xz tinyxml2 p7zip python-pip unrar sharutils unace uudeview
16+
sudo pacman -Syu --needed --noconfirm android-tools aria2 arj brotli cabextract cmake dtc gcc git lz4 xz tinyxml2 python-pip unrar sharutils unace uudeview
1717
elif [[ -e "/usr/bin/dnf" ]]; then
18-
sudo dnf install --refresh android-tools aria2 arj brotli cabextract cmake dtc gcc git lz4 xz tinyxml2 p7zip python-pip unrar sharutils unace zip unzip uudeview zip
18+
sudo dnf install --refresh android-tools aria2 arj brotli cabextract cmake dtc gcc git lz4 xz tinyxml2 python-pip unrar sharutils unace zip unzip uudeview zip
1919
fi
2020
pip3 install backports.lzma docopt protobuf pycrypto zstandard

scripts/common.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,10 @@ git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-m
1313
git clone https://github.com/zsh-users/zsh-syntax-highlighting ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
1414

1515
sed -i 's|plugins=(git)|plugins=(git zsh-autosuggestions zsh-syntax-highlighting)|g' ~/.zshrc
16+
17+
# Install 7zz
18+
URL_7ZZ="$(curl -sL https://api.github.com/repos/ip7z/7zip/releases/latest | grep -oP '(?<="browser_download_url": ")[^"]*linux-x64\.tar\.xz')"
19+
wget "${URL_7ZZ}" -O 7zz.tar.xz
20+
tar -xJf 7zz.tar.xz -C /usr/local/bin 7zz 7zzs
21+
rm 7zz.tar.xz
22+
ln -sf /usr/local/bin/7z{z,}

0 commit comments

Comments
 (0)