JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge neofetch to armbian-config (#2499)

Browse Source
This commit is contained in:
Igor Pečovnik
2021-04-18 22:49:30 +02:00
committed by GitHub
parent 510e348202
commit b164fcf54b
2 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/compilation.sh
View File

@@ -637,6 +637,8 @@ compile_armbian-config()
display_alert "Building deb" "armbian-config" "info" display_alert "Building deb" "armbian-config" "info"
fetch_from_repo "https://github.com/armbian/config" "armbian-config" "branch:master" fetch_from_repo "https://github.com/armbian/config" "armbian-config" "branch:master"
fetch_from_repo "https://github.com/dylanaraps/neofetch" "neofetch" "tag:7.1.0"
fetch_from_repo "https://github.com/complexorganizations/wireguard-manager" "wireguard-manager" "tag:1.0.11"
mkdir -p "${tmp_dir}/${armbian_config_dir}"/{DEBIAN,usr/bin/,usr/sbin/,usr/lib/armbian-config/} mkdir -p "${tmp_dir}/${armbian_config_dir}"/{DEBIAN,usr/bin/,usr/sbin/,usr/lib/armbian-config/}
@@ -646,8 +648,8 @@ compile_armbian-config()
Version: $REVISION Version: $REVISION
Architecture: all Architecture: all
Maintainer: $MAINTAINER <$MAINTAINERMAIL> Maintainer: $MAINTAINER <$MAINTAINERMAIL>
Replaces: armbian-bsp Replaces: armbian-bsp, neofetch
Depends: bash, iperf3, psmisc, curl, bc, expect, dialog, pv, \ Depends: bash, iperf3, psmisc, curl, bc, expect, dialog, pv, zip, \
debconf-utils, unzip, build-essential, html2text, apt-transport-https, html2text, dirmngr, software-properties-common, debconf, jq debconf-utils, unzip, build-essential, html2text, apt-transport-https, html2text, dirmngr, software-properties-common, debconf, jq
Recommends: armbian-bsp Recommends: armbian-bsp
Suggests: libpam-google-authenticator, qrencode, network-manager, sunxi-tools Suggests: libpam-google-authenticator, qrencode, network-manager, sunxi-tools
@@ -656,6 +658,11 @@ compile_armbian-config()
Description: Armbian configuration utility Description: Armbian configuration utility
END END
install -m 755 "${SRC}"/cache/sources/neofetch/neofetch "${tmp_dir}/${armbian_config_dir}"/usr/bin/neofetch
cd "${tmp_dir}/${armbian_config_dir}"/usr/bin/
process_patch_file "${SRC}/patch/misc/add-armbian-neofetch.patch" "applying"
install -m 755 "${SRC}"/cache/sources/wireguard-manager/wireguard-manager.sh "${tmp_dir}/${armbian_config_dir}"/usr/bin/wireguard-manager
install -m 755 "${SRC}"/cache/sources/armbian-config/scripts/tv_grab_file "${tmp_dir}/${armbian_config_dir}"/usr/bin/tv_grab_file install -m 755 "${SRC}"/cache/sources/armbian-config/scripts/tv_grab_file "${tmp_dir}/${armbian_config_dir}"/usr/bin/tv_grab_file
install -m 755 "${SRC}"/cache/sources/armbian-config/debian-config "${tmp_dir}/${armbian_config_dir}"/usr/sbin/armbian-config install -m 755 "${SRC}"/cache/sources/armbian-config/debian-config "${tmp_dir}/${armbian_config_dir}"/usr/sbin/armbian-config
install -m 644 "${SRC}"/cache/sources/armbian-config/debian-config-jobs "${tmp_dir}/${armbian_config_dir}"/usr/lib/armbian-config/jobs.sh install -m 644 "${SRC}"/cache/sources/armbian-config/debian-config-jobs "${tmp_dir}/${armbian_config_dir}"/usr/lib/armbian-config/jobs.sh

44
patch/misc/add-armbian-neofetch.patch Normal file
View File

@@ -0,0 +1,44 @@
diff --git a/neofetch b/neofetch
index 1e4b564..f59eca6 100755
--- a/neofetch
+++ b/neofetch
@@ -967,6 +967,10 @@ get_distro() {
*) distro="Red Star OS $(awk -F'[^0-9*]' '$0=$2' /etc/redstar-release)"
esac
+ elif [[ -f /etc/armbian-release ]]; then
+ . /etc/armbian-release
+ distro="Armbian $DISTRIBUTION_CODENAME ($VERSION)"
+
elif [[ -f /etc/siduction-version ]]; then
case $distro_shorthand in
on|tiny) distro=Siduction ;;
@@ -5336,6 +5340,28 @@ ${c1}
EOF
;;
+ "Armbian"*)
+ set_colors 1 1
+ read -rd '' ascii_data <<'EOF'
+ ${c1}
+
+ █ █ █ █ █ █ █ █ █ █ █
+ ███████████████████████
+ ▄▄██ ██▄▄
+ ▄▄██ ███████████ ██▄▄
+ ▄▄██ ██ ██ ██▄▄
+ ▄▄██ ██ ██ ██▄▄
+ ▄▄██ ██ ██ ██▄▄
+ ▄▄██ █████████████ ██▄▄
+ ▄▄██ ██ ██ ██▄▄
+ ▄▄██ ██ ██ ██▄▄
+ ▄▄██ ██ ██ ██▄▄
+ ▄▄██ ██▄▄
+ ███████████████████████
+ █ █ █ █ █ █ █ █ █ █ █
+EOF
+ ;;
+
"alpine_small")
set_colors 4 7
read -rd '' ascii_data <<'EOF'