Skip to content
This repository has been archived by the owner on Apr 9, 2022. It is now read-only.

Commit

Permalink
Remove i686 support, add AMD drivers and update wallpaper download pr…
Browse files Browse the repository at this point in the history
…ocedure (#900)

* Remove i686 code from scripts

* Update wallpaper download procedure (remove wallpapers folder and clone from brand directory when generating iso)

* Add AMDGPU driver (`xf86-video-amdgpu`) to menu and add a translatable variable for it (gr10)

* Add output and log directory arguments to help menu (`-o`/`--output-dir` and `-l`/`--log-dir`)
  • Loading branch information
Erazem Kokot committed Oct 17, 2019
1 parent 7b2774c commit e263515
Show file tree
Hide file tree
Showing 42 changed files with 111 additions and 207 deletions.
12 changes: 9 additions & 3 deletions etc/anarchy.conf
Expand Up @@ -121,20 +121,28 @@ config() {
;;
-u|--update)
tmp_dir=$(mktemp -d)
wallpaper_dir=$(mktemp -d)
echo -ne "\n${Yellow}*> Anarchy: Downloading..."
wget -q -4 --no-check-certificate -O ${tmp_dir}/master.tar.gz https://github.com/AnarchyLinux/installer/archive/master.tar.gz
if [ "$?" -gt "0" ]; then
echo -e "${Red}*> Error: ${Yellow}Active network connection not detected - Please connect to the internet and try again. Exiting..."
exit 2
fi
wget -q -4 --no-check-certificate -O ${tmp_dir}/master.tar.gz https://github.com/AnarchyLinux/brand/archive/master.tar.gz
if [ "$?" -gt "0" ]; then
echo -e "${Red}*> Error: ${Yellow}Active network connection not detected - Please connect to the internet and try again. Exiting..."
exit 2
fi
echo -e "${Green}done"

echo -ne "\n${Yellow}*> Anarchy: Updating..."
tar zxf ${tmp_dir}/master.tar.gz -C ${tmp_dir} &> /dev/null
tar zxf ${wallpaper_dir}/master.tar.gz -C ${wallpaper_dir} &> /dev/null
cp ${tmp_dir}/installer-master/anarchy-installer.sh /usr/bin/anarchy
cp ${tmp_dir}/installer-master/etc/anarchy.conf /etc/anarchy.conf
cp ${tmp_dir}/installer-master/lib/* /usr/lib/anarchy/
cp ${tmp_dir}/installer-master/lang/* /usr/share/anarchy/lang/
cp "${wallpaper_dir}"/brand-master/wallpapers/official/* /usr/share/anarchy/extra/
cp -f ${tmp_dir}/installer-master/extra/{sysinfo,iptest} /usr/bin/
cp -r ${tmp_dir}/installer-master/extra/* /usr/share/anarchy/extra/
echo -e "${Green}done"
Expand Down Expand Up @@ -186,6 +194,7 @@ config() {
gr7="NVIDIA 340xx $drivers"
gr8="NVIDIA ${os} $drivers"
gr9="NVIDIA 390xx $drivers"
gr10="AMDGPU Video ${drivers}"

# Desktop messages
de0="Xfce4 Light Desktop"
Expand Down Expand Up @@ -465,9 +474,6 @@ config() {
wifi=true
fi

# Check system architecture
arch=$(uname -a | grep -o "x86_64\|i386\|i686")

# Check for VM
case $(systemd-detect-virt) in
oracle)
Expand Down
91 changes: 0 additions & 91 deletions etc/i686-pacman.conf

This file was deleted.

24 changes: 12 additions & 12 deletions etc/local-pacman.conf → etc/pacman.conf
Expand Up @@ -14,6 +14,7 @@
#CacheDir = /var/cache/pacman/pkg/
#LogFile = /var/log/pacman.log
#GPGDir = /etc/pacman.d/gnupg/
#HookDir = /etc/pacman.d/hooks/
HoldPkg = pacman glibc
#XferCommand = /usr/bin/curl -C - -f %u > %o
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
Expand All @@ -32,7 +33,8 @@ Architecture = auto
#UseSyslog
Color
TotalDownload
CheckSpace
# We cannot check disk space from within a chroot environment
#CheckSpace
#VerbosePkgLists

# By default, pacman accepts packages signed by keys that its local keyring
Expand Down Expand Up @@ -64,29 +66,24 @@ LocalFileSigLevel = Optional
# uncommented to enable the repo.
#

# Local Repository
[install-repo]
Server = file:///repo/install-repo
SigLevel = Never

# The testing repositories are disabled by default. To enable, uncomment the
# repo name header and Include lines. You can add preferred servers immediately
# after the header, and they will be used before the default mirrors.

#[testing]
#Include = /etc/pacman.d/mirrorlist

#[core]
#Include = /etc/pacman.d/mirrorlist
[core]
Include = /etc/pacman.d/mirrorlist

#[extra]
#Include = /etc/pacman.d/mirrorlist
[extra]
Include = /etc/pacman.d/mirrorlist

#[community-testing]
#Include = /etc/pacman.d/mirrorlist

#[community]
#Include = /etc/pacman.d/mirrorlist
[community]
Include = /etc/pacman.d/mirrorlist

# If you want to run 32 bit applications on your x86_64 system,
# enable the multilib repositories as required here.
Expand All @@ -102,3 +99,6 @@ SigLevel = Never
#[custom]
#SigLevel = Optional TrustAll
#Server = file:///home/custompkgs
[anarchy-local]
Server = file:///usr/share/anarchy/pkg
SigLevel = Never
Binary file removed extra/wallpapers/Anarchy-Aurora.jpeg
Binary file not shown.
Binary file removed extra/wallpapers/Anarchy-Carbon_Mesh.png
Binary file not shown.
Binary file removed extra/wallpapers/Anarchy-Fire.jpeg
Binary file not shown.
Binary file removed extra/wallpapers/Anarchy-Login.jpeg
Binary file not shown.
Binary file removed extra/wallpapers/Anarchy-Splatter.jpeg
Binary file not shown.
Binary file removed extra/wallpapers/Anarchy-Tunnel.jpeg
Binary file not shown.
Binary file removed extra/wallpapers/Anarchy.jpeg
Binary file not shown.
Binary file removed extra/wallpapers/Audi.jpeg
Binary file not shown.
Binary file removed extra/wallpapers/City-Dark.jpeg
Binary file not shown.
Binary file removed extra/wallpapers/City-Lights.jpeg
Binary file not shown.
Binary file removed extra/wallpapers/City.jpeg
Binary file not shown.
Binary file removed extra/wallpapers/Earth-Full.jpeg
Binary file not shown.
Binary file removed extra/wallpapers/Earth.jpeg
Binary file not shown.
Binary file removed extra/wallpapers/Faction.jpeg
Binary file not shown.
Binary file removed extra/wallpapers/Girl.jpeg
Binary file not shown.
Binary file removed extra/wallpapers/Lake.jpeg
Binary file not shown.
Binary file removed extra/wallpapers/Stars.jpeg
Binary file not shown.
Binary file removed extra/wallpapers/Tiger.jpeg
Binary file not shown.

0 comments on commit e263515

Please sign in to comment.