Merge pull request 'master' (#7) from Ohio2/repo:master into master

Reviewed-on: #7

binutils/build

@@ -1,6 +1,6 @@
-wget -O binutils.tar.xz https://ftp.gnu.org/gnu/binutils/binutils-2.36.1.tar.xz
-tar -xfJ binutils.tar.xz
-cd binutils
+wget -O ${temp_location}/binutils/binutils.tar.xz https://ftp.gnu.org/gnu/binutils/binutils-2.36.1.tar.xz
+tar -xf ${temp_location}/binutils/binutils.tar.xz
+cd ${temp_location}/biinutils/binutils
 chmod +x makeinfo
 export PATH=$PATH:$PWD
 ./configure \

busybox/build

@@ -1,6 +1,6 @@
-wget -O busybox.tar.bz2 https://busybox.net/downloads/busybox-1.33.1.tar.bz2
-tar -xf busybox.tar.bz2
-cd busybox
+wget -O ${temp_location}/busybox/busybox.tar.bz2 https://busybox.net/downloads/busybox-1.33.1.tar.bz2
+tar -xf ${temp_location}/busybox/busybox.tar.bz2
+cd ${temp_location}/busybox
 make defconfig
 LDFLAGS="--static" make
 make install DESTDIR="$1"

bzip2/build

@@ -1,6 +1,6 @@
-wget -O bzip2.tar.gz https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
-tar -xfz bzip2.tar.gz
-cd bzip2
+wget -O ${temp_location}/bzip2/bzip2.tar.gz https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
+tar -xf ${temp_location}/bzip2/bzip2.tar.gz
+cd ${temp_location}/bzip2/bzip2
 make CC="${CC:-cc} $CFLAGS -fPIC $LDFLAGS" -f Makefile-libbz2_so
 make CC="${CC:-cc} $CFLAGS -static -fPIC $LDFLAGS" bzip2
 mkdir -p "$1/usr/bin" "$1/usr/lib" "$1/usr/share/man/man1" "$1/usr/include"

gcc/build

@@ -1,6 +1,6 @@
-wget -O gcc.tar.gz 
-tar -xfz gcc.tar.gz
-cd gcc
+wget -O ${temp_location}/gcc/gcc.tar.gz 
+tar -xf ${temp_location}/gcc/gcc.tar.gz
+cd ${temp_location}/gcc/gcc
 sed -i '/m64=/s/lib64/lib/' gcc/gcc/config/i386/t-linux64
 sed -i 's/lib64/lib/'       gcc/gcc/config/i386/linux64.h
 mkdir build

git/build

@@ -1,6 +1,6 @@
-wget -O git.tar.xz https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.9.5.tar.xz
-tar -xfJ git.tar.xz
-cd git
+wget -O ${temp_location}/git/git.tar.xz https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.9.5.tar.xz
+tar -xf ${temp_location}/git/git.tar.xz
+cd ${temp_location}/git/git
 ./configure --prefix=/usr
 make
 make install DESTDIR="$1"

glibc/build

@@ -1,6 +1,6 @@
-wget -O glibc.tar.gz https://ftp.gnu.org/gnu/libc/glibc-2.33.tar.gz
-tar -xfz glibc.tar.gz
-cd glibc
+wget -O ${temp_location}/glibc/glibc.tar.gz https://ftp.gnu.org/gnu/libc/glibc-2.33.tar.gz
+tar -xf ${temp_location}/glibc/glibc.tar.gz
+cd ${temp_location}/glibc/glibc
 mkdir build
 cd build
 ../configure --prefix=/usr

gzip/build

@@ -1,6 +1,6 @@
-wget -O gzip.tar.gz https://zlib.net/pigz/pigz-2.6.tar.gz
-tar -xfz gzip.tar.gz
-cd gzip
+wget -O ${temp_location}/gzip/gzip.tar.gz https://zlib.net/pigz/pigz-2.6.tar.gz
+tar -xf ${temp_location}/gzip/gzip.tar.gz
+cd ${temp_location}/gzip/gzip
 make CC="${CC:-cc} -static"
 mkdir -p "$1/usr/bin" "$1/usr/share/man/man1"
 cp -f pigz unpigz "$1/usr/bin"

hummingbird/build

@@ -1,4 +1,4 @@
-git clone https://github.com/Sweets/hummingbird hummingbird-build
-cd hummingbird-build
+git clone https://github.com/Sweets/hummingbird ${temp_location}/hummingbird-build
+cd ${temp_location}/hummingbird-build
 make
 make install DESTDIR=$1

make/build

@@ -1,6 +1,6 @@
-wget -O make.tar.gz https://ftp.gnu.org/gnu/make/make-4.3.tar.gz
-untar -xfz make.tar.gz
-cd make
+wget -O ${temp_location}/make/make.tar.gz https://ftp.gnu.org/gnu/make/make-4.3.tar.gz
+untar -xf ${temp_location}/make/make.tar.gz
+cd ${temp_location}/make/make
 export CFLAGS="$CFLAGS -static"
 ./configure --prefix=/usr
 make

openssl/build

@@ -1,6 +1,6 @@
-wget -O openssl.tar.gz https://www.openssl.org/source/openssl-3.0.0-beta1.tar.gz
-tar -xfz openssl.tar.gz
-cd openssl
+wget -O ${temp_location}/openssl/openssl.tar.gz https://www.openssl.org/source/openssl-3.0.0-beta1.tar.gz
+tar -xf ${temp_location}/openssl/openssl.tar.gz
+cd ${temp_location}/openssl/openssl
 chmod +x ./config
 ./config --prefix="/usr"
 make

ufetch/package

@@ -0,0 +1,5 @@
+pkg_config_deploy="true"
+pkg_config_ver="0.0.1"
+pkg_config_name="ufetch"
+pkg_config_makedepends=""
+pkg_config_depends=""

ufetch/payload/usr/bin/patch

@@ -0,0 +1,8 @@
+9c9
+< os='Linux'	# I'd just like to interject for a moment...
+---
+> os='Alnux'	# I'd just like to interject for a moment... Alnux is a linux distro that is closed down and tightly controlled...
+12c12
+< packages='unknown'
+---
+> packages="$(aps list | wc -l)"

ufetch/payload/usr/bin/ufetch

@@ -0,0 +1,85 @@
+#!/bin/sh
+#
+# ufetch-linux - tiny system info for linux
+
+## INFO
+
+# user is already defined
+host="$(hostname)"
+os='Linux'	# I'd just like to interject for a moment...
+kernel="$(uname -sr)"
+uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
+packages='unknown'
+shell="$(basename "${SHELL}")"
+
+## UI DETECTION
+
+parse_rcs() {
+	for f in "${@}"; do
+		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
+		[ -n "${wm}" ] && echo "${wm}" && return
+	done
+}
+
+rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
+
+ui='unknown'
+uitype='UI'
+if [ -n "${DE}" ]; then
+	ui="${DE}"
+	uitype='DE'
+elif [ -n "${WM}" ]; then
+	ui="${WM}"
+	uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+	ui="${XDG_CURRENT_DESKTOP}"
+	uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+	ui="${DESKTOP_SESSION}"
+	uitype='DE'
+elif [ -n "${rcwm}" ]; then
+	ui="${rcwm}"
+	uitype='WM'
+elif [ -n "${XDG_SESSION_TYPE}" ]; then
+	ui="${XDG_SESSION_TYPE}"
+fi
+
+ui="$(basename "${ui}")"
+
+## DEFINE COLORS
+
+# probably don't change these
+if [ -x "$(command -v tput)" ]; then
+	bold="$(tput bold)"
+	black="$(tput setaf 0)"
+	red="$(tput setaf 1)"
+	green="$(tput setaf 2)"
+	yellow="$(tput setaf 3)"
+	blue="$(tput setaf 4)"
+	magenta="$(tput setaf 5)"
+	cyan="$(tput setaf 6)"
+	white="$(tput setaf 7)"
+	reset="$(tput sgr0)"
+fi
+
+# you can change these
+lc="${reset}${bold}"                # labels
+nc="${reset}${bold}"                # user and hostname
+ic="${reset}"                       # info
+c0="${reset}${black}"               # first color
+c1="${reset}${white}"               # second color
+c2="${reset}${yellow}"              # third color
+
+## OUTPUT
+
+cat <<EOF
+
+${c0}      ___     ${nc}${USER}${ic}@${nc}${host}${reset}
+${c0}     (${c1}.. ${c0}\    ${lc}OS:        ${ic}${os}${reset}
+${c0}     (${c2}<> ${c0}|    ${lc}KERNEL:    ${ic}${kernel}${reset}
+${c0}    /${c1}/  \\ ${c0}\\   ${lc}UPTIME:    ${ic}${uptime}${reset}
+${c0}   ( ${c1}|  | ${c0}/|  ${lc}PACKAGES:  ${ic}${packages}${reset} 
+${c2}  _${c0}/\\ ${c1}__)${c0}/${c2}_${c0})  ${lc}SHELL:     ${ic}${shell}${reset}
+${c2}  \/${c0}-____${c2}\/${reset}   ${lc}${uitype}:        ${ic}${ui}${reset}
+
+EOF

ufetch/postdeploy

@@ -0,0 +1 @@
+patch -p1 < patch

xz/build

@@ -1,6 +1,6 @@
-wget -O xz.tar.gz https://tukaani.org/xz/xz-5.2.5.tar.gz 
-tar -xfJ xz.tar.gz
-cd xz
+wget -O ${temp_location}/xz/xz.tar.gz https://tukaani.org/xz/xz-5.2.5.tar.gz 
+tar -xf ${temp_location}/xz/xz.tar.gz
+cd ${temp_location}/xz/xz
 ./configure --prefix=/usr --disable-nls
 make
 make install DESTDIR="$1"

zlib/build

@@ -1,6 +1,6 @@
-wget -O zlib.tar.gz https://zlib.net/zlib-1.2.11.tar.gz
-tar -xfz zlib.tar.gz
-cd zlib
+wget -O ${temp_location}/zlib/zlib.tar.gz https://zlib.net/zlib-1.2.11.tar.gz
+tar -xf ${temp_location}/zlib/zlib.tar.gz
+cd ${temp_location}/zlib/zlib
 export CFLAGS="$CFLAGS -fPIC"
 ./configure --prefix="$1" --lib-dir="/usr/lib" --shared
 make