Replace all occurrences of apt with apt-get

This commit is contained in:
Fierelier 2023-04-09 10:05:18 +02:00
parent 26ab6d7ec1
commit a55394f109
12 changed files with 31 additions and 31 deletions

View File

@ -3,10 +3,10 @@ set -e
if [[ -f "/usr/local/bin/xmousepasteblock" ]]; then
exit
fi
apt -y install git build-essential libev-dev libx11-dev libxi-dev
apt-get -y install git build-essential libev-dev libx11-dev libxi-dev
git clone https://github.com/milaq/XMousePasteBlock
cd XMousePasteBlock
make
mv xmousepasteblock /usr/local/bin
cd ..
rm -rf XMousePasteBlock
rm -rf XMousePasteBlock

View File

@ -1,4 +1,4 @@
#!/bin/bash
set -e
apt -y remove build-essential git pkg-config *-dev
apt -y autoremove
apt-get -y remove build-essential git pkg-config *-dev
apt-get -y autoremove

View File

@ -3,10 +3,10 @@ set -e
if [[ -f "/usr/local/bin/ksuperkey" ]]; then
exit
fi
apt -y install git pkg-config build-essential libx11-dev libxtst-dev
apt-get -y install git pkg-config build-essential libx11-dev libxtst-dev
git clone https://github.com/hanschen/ksuperkey
cd ksuperkey
make
mv ksuperkey /usr/local/bin/ksuperkey
cd ..
rm -rf ksuperkey
rm -rf ksuperkey

View File

@ -1,4 +1,4 @@
#!/bin/bash
set -e
apt -y install findutils file xz-utils
update-initramfs -u
apt-get -y install findutils file xz-utils
update-initramfs -u

View File

@ -1,3 +1,3 @@
#!/bin/bash
set -e
apt install -y --download-only cryptsetup cryptsetup-initramfs
apt-get install -y --download-only cryptsetup cryptsetup-initramfs

View File

@ -279,7 +279,7 @@ def main():
if encrypt:
print("> Encrypting partition ...")
call(["apt","-y","install","cryptsetup"],stdout=subprocess.DEVNULL)
call(["apt-get","-y","install","cryptsetup"],stdout=subprocess.DEVNULL)
cryptPartition = installPartition
mainPass = encryptionPasswords.pop(0)
@ -352,14 +352,14 @@ def main():
shutil.copyfile("/etc/default/keyboard",ipth("etc/default/keyboard"))
print("> Removing live-specific packages ...")
chroot(ipth(),["apt","-y","remove","live-boot","live-boot-initramfs-tools"])
chroot(ipth(),["apt","-y","autoremove"])
chroot(ipth(),["apt-get","-y","remove","live-boot","live-boot-initramfs-tools"])
chroot(ipth(),["apt-get","-y","autoremove"])
os.remove(ipth("bin/login"))
os.rename(ipth("bin/login.oobe"),ipth("bin/login"))
if encrypt:
print("> Installing encryption-specific packages ...")
chroot(ipth(),["apt","-y","install","cryptsetup-initramfs"])
chroot(ipth(),["apt-get","-y","install","cryptsetup-initramfs"])
else:
print("> Updating initramfs ...")
chroot(ipth(),["update-initramfs","-u"])
@ -405,4 +405,4 @@ def main():
print("Success. Press ENTER to quit setup.")
input()
main()
main()

View File

@ -11,7 +11,7 @@ while true; do
echo ""
if [ "$CHOICE" == "1" ]; then
apt -y install locales tzdata
apt-get -y install locales tzdata
dpkg-reconfigure locales
dpkg-reconfigure tzdata
groupadd -f sudo
@ -67,4 +67,4 @@ ff02::2 ip6-allrouters
fi
echo ""
done
done

View File

@ -3,20 +3,20 @@ set -e
cat << EOF | debconf-set-selections
firmware-ipw2x00 firmware-ipw2x00/license/accepted boolean true
EOF
apt --error-on=any -y update
apt -y upgrade
apt -y install $WDVN_PACKAGES_INTERACTIVE
apt-get --error-on=any -y update
apt-get -y upgrade
apt-get -y install $WDVN_PACKAGES_INTERACTIVE
export DEBIAN_FRONTEND="noninteractive"
apt -y install $WDVN_PACKAGES
apt-get -y install $WDVN_PACKAGES
update-rc.d keyboard-setup.sh defaults
if [ "$WDVN_ONLINE" != "1" ]; then
if [ "$WDVN_FAT" != "1" ]; then
apt -y install --download-only $WDVN_PACKAGES_DL
apt-get -y install --download-only $WDVN_PACKAGES_DL
else
apt -y install $WDVN_PACKAGES_DL
apt-get -y install $WDVN_PACKAGES_DL
fi
fi
unset DEBIAN_FRONTEND
apt -y autoclean
apt-get -y autoclean

View File

@ -8,10 +8,10 @@ nmtui
' >> "$1/oobe/setupComplete/50-packages"
fi
echo "apt -y install $WDVN_PACKAGES_DL
apt -y remove $WDVN_PACKAGES_REMOVE
apt -y autoremove
apt -y clean
echo "apt-get -y install $WDVN_PACKAGES_DL
apt-get -y remove $WDVN_PACKAGES_REMOVE
apt-get -y autoremove
apt-get -y clean
" >>"$1/oobe/setupComplete/50-packages"
chmod +x "$1/oobe/setupComplete/50-packages"

View File

@ -1,4 +1,4 @@
#!/bin/bash
set -e
apt --error-on=any -y update
apt -y upgrade
apt-get --error-on=any -y update
apt-get -y upgrade

View File

@ -1,5 +1,5 @@
#!/bin/bash
set -e
echo "deb http://downloads.sourceforge.net/project/ubuntuzilla/mozilla/apt all main" >>"/etc/apt/sources.list"
apt -y install dirmngr
apt-get -y install dirmngr
apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 2667CA5C

View File

@ -1,3 +1,3 @@
#!/bin/sh
set -e
apt --error-on=any -y update
apt-get --error-on=any -y update