Merge pull request 'APS release v0.0.8.1 codename: Cleveland' (#11) from Ohio2/aps:master into master

Reviewed-on: alnux/aps#11

README.md

@@ -1,3 +1,5 @@
-# APS
-APS - Alnux Packaging System
+# aps
 
+the alnux package manager
+
+(the code is completely and utterly horrible and i cant believe i actually wrote this lol)

altools/README.md

@@ -1,2 +0,0 @@
-# This follows the UNIX philosophy
-Actually, also altools is meant to be in shell since it's ok

altools/alinitsys

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-#############
-# ALINITSYS #
-#############
-
-# ALINITSYS is a passthrough to RUNIT OR OPENRC, if RUNIT OR OPENRC exists, if not, then ALINITSYS will wrap it up and init the system.
-
-function init(){
-	exec runit && echo ":: Running Runit..." || echo ":: Runit not found..." ;
-	exec openrc && echo ":: Running OpenRC..." || echo ":: OpenRC not found..." ;
-	echo ":: Running alinitsys"
-}
-function rescue(){
-	echo "[E] Something might've went wrong..."
-	echo ":: Dropping into the SH"
-	exec sh
-}
-function daemon(){
-	/var/service/*/start
-}
-function getty(){
-	echo ":: Getting TTY"
-	exec getty || exec stty
-}
-function start(){
-	init ||
-	daemon &&
-	getty ||
-	rescue
-}
-start

altools/c/Makefile

@@ -1,5 +0,0 @@
-ccflags = -O3
-compile:
-	gcc $(ccflags) pow.c -o pow
-clean:
-	rm pow

altools/c/pow.c

@@ -1,28 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/reboot.h>
-
-int main (int argc, char *argv[]) {
-    if (geteuid() != 0) {
-        printf("[E] pow must be run as root\n");
-        return 1;
-    }
-
-    sync();
-
-    switch (argv[1] ? argv[1][0]: 0) {
-        case 's':
-	case 'p':
-            reboot(RB_POWER_OFF);
-            return 0;
-
-        case 'r':
-            reboot(RB_AUTOBOOT);
-            return 0;
-
-        default:
-            printf("pow r[eboot]|p[oweroff]|s[hutdown]\n");
-            return 1;
-    }
-}

altools/chroot-al

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-mount -t proc /proc $1/proc
-mount -t sysfs /sys $1/sys
-mount -o bind /dev $1/dev
-mount -o bind /run $1/run
-mount -o bind /sys/firmware/efi/efivars $1/sys/firmware/efi/efivars
-cp /etc/resolv.conf $1/etc/resolv.conf
-export MAKEFLAGS="-j$(nproc)"
-export CFLAGS="-O2 -pipe -march-native"
-export CXXFALGS="${CFLAGS}"
-chroot $1 /bin/sh

altools/dae

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-###########################
-# DAE, the deamon manager #
-###########################
-
-function daemonctl(){
-        case $1 in
-                stop) . /etc/al/serivces/$2.alsysd 
-     			stop  ;;
-                start) . /etc/al/services/$2.alsysd 
-                        start ;;
-        esac
-	case $2 in
-		--verbose) set -x ;;
-		*) ;;
-	esac
-}

altools/mkaltar

@@ -1,4 +0,0 @@
-#!/bin/sh
-export AL_CFG="../config/config"
-export AL_REPO="/var/tmp/alroot/var/aps/repos/official"
-../aps s alnux

altools/mkinitramfs

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-###############
-# MKINITRAMFS #
-###############
-
-if [ ! -d /usr/src/initramfs ]; then
-	mkdir -p /usr/src/initramfs/{bin,dev,etc,lib,lib64,mnt/root,proc,root,sbin,sys}
-       	cp --archive /dev/{null,console,tty,sd*} /usr/src/initramfs/dev/
-	cp --archive /bin/busybox /usr/src/initramfs/bin/busybox
-fi
-cd /usr/src/initramfs
-find . -print0 | cpio --null --create --verbose --format=newc | gzip --best > /boot/initramfs.cpio.gz

altools/repo

@@ -6,13 +6,13 @@
 . /etc/al/config
 case $1 in
 	# add a repo
-	add) git clone ${2} ${install_root}/var/db/repos 
+	add) git clone https://${3}/${2}.git ${install_root}/var/aps/repos/${2} 
 		echo "${2}" >> ${install_root}/etc/al/repo.conf
 		;;
 	# update a repo
 	update) pushd && cd ${install_root}/var/aps/repos/${2} && git pull && popd ;;
 	# destroy a repo (remove)
-	destroy) rm -rfv ${install_root}/var/db/aps/repos/${2}
+	destroy) rm -rfv ${install_root}/var/aps/repos/${2}
 	sed -i "/^${2}/d" ${install_root}/etc/al/repo.conf	
 	;;
 esac

aps

@@ -1,198 +1,150 @@
 #!/bin/sh
 
-###################
-# aps. rewritten. #
-###################
-# OHIO: aps *needs* to be rewritten, i can't add any thing else in the aps (v0.0.8.1)
-# OHIO: aps is rewritten in 9/10th's so it's no longer a debug build
-# OHIO: it's rewritten however it has some old code from aps (v0.0.8.1)
-# KEMAL: abandon all hope, ye who enter here.
-# OHIO:  ^, however my code is cleaner than the mess before.
-function conf_fetch(){
-    if [ -f "$XDG_CONFIG_HOME/al/config" ]; then
-	    . $XDG_CONFIG_HOME/al/config
-    elif [ -f "$HOME/.config/al/config" ]; then
-	    . $HOME/.config/al/config
-    elif [ -f "/etc/al/config" ]; then
-	    . /etc/al/config
-    elif [ -f "/etc/skel/al/config" ]; then
-        . /etc/skel/al/config
-    #elif [ -f $AL_CFG ]; then
-    #    . $AL_CFG
-    else
-        wrn "No config file!"
-        temp_location="/var/tmp"
-	    install_root="/var/tmp/alroot"
-	    installed_pkg_database="${install_root}/var/aps/installed"
-	    locpkg_database="${install_root}/var/aps/repos"
-	    lock="${install_root}/var/aps/lock"
-	    official="https://git.hippoz.xyz/alnux/repo"
-    	debug=off
-        #echo $AL_REPO
-        #AL_REPO=$(echo $AL_REPO | cut -d':')
-        #echo $AL_REPO
-    fi
-}
-case ${debug} in
-    on) set -x ;;
-esac
-function prn(){
-    echo -e "\e[34m==>\e[39m $1"
-}
-function wrn(){
-    echo -e "\e[34m==>\e[33m WARNING:\e[39m $1"
-}
-function err(){
-    echo -e "\e[34m==>\e[31m ERROR:\e[39m $1" &&
-    rm ${lock} 2> /dev/null
+#################################
+# Alnux Packaging System,       #
+# the package manager for Alnux #
+#################################
+
+if [ -f "$XDG_CONFIG_HOME/al/config" ]; then
+	. $XDG_CONFIG_HOME/al/config
+elif [ -f "$HOME/.config/al/config" ]; then
+	. $HOME/.config/al/config
+elif [ -f "/etc/al/config" ]; then
+	. /etc/al/config
+else
+	temp_location="/var/tmp"
+	install_root="/var/tmp/alroot"
+	installed_pkg_database="${install_root}/var/aps/installed"
+	locpkg_database="${install_root}/var/aps/repos"
+	lock="${install_root}/var/aps/lock"
+	official="https://git.hippoz.xyz/alnux/repo"
+	debug=off
+fi
+if [ ${debug} = on ]; then
+	set -x
+fi
+die() {
+    echo "aps: fatal: ${1}"
+    rm "${lock}"
     exit 2
 }
-conf_fetch
-function notf(){
-    echo -e "\e[34m==>\e[36m NOTIFICATION:\e[39m $1"
+confirm(){
+        echo -ne "Are you sure? [Y/n] "
+        read prompt
+        if [[ ${prompt} = [nN] ]]; then
+                die "User said no. Exiting..."
+        elif [[ ${prompt} != [yY] ]]; then
+                die "User gave invalid input. Exiting..."
+        fi
 }
-function confirm(){
-    prn "To continue press ENTER, or to exit CTRL-C"
-    read -p
-}
-function sources(){
-    pkg_config_url="$1"
-    pkg_config_url_prefix=$(echo ${pkg_config_url} | cut -d'+' -f1)
-    pkg_config_url_rest=$(echo ${pkg_config_url} | cut -d+ -f2)
-    case $pkg_config_url_prefix in
-        git) mkdir pkgsrc && git clone ${pkg_config_url_rest} pkgsrc ;;
-        web) pkg_config_archv=$(echo ${pkg_config_url} | sed 's:.*/::')
-        curl -fLO "${pkg_config_url_rest}"
-        mkdir --parents pkgex
-        pkg_config_archv_ft=$(file --extension ${pkg_config_archv_ft})
-        case $pkg_config_archv_ft in
-            *.tar*) prn $(tar -xf ${pkg_config_archv} -C pkgex) ;;
-            *.xz) prn $(cd pkgex && xz -d ../${pkg_config_archv} && cd ..) ;;
-            *.bz2) prn $(cd pkgex && bzip2 -d ../${pkg_config_archv} && cd ..) ;;
-            *.gz) cd pkgex && gzip -d ../${pkg_config_archv} && cd .. ;;
-            *) ;;
-        esac 
-        mkdir --parents pkgsrc
-        cp -r pkgex/*/* pkgsrc ;;
-        *) err "Old Alnux sources is probably used!"
-    esac
-
-}
-function sha256(){
-    #sha256sum $sum > $1.sha256sum
-    sha256sum -c "$1" 1>&2 /dev/null 
-    if [ "$?" -eq "0" ]; then
-        prn "OK!"
-    else
-        err "Sha failed!"
-    fi
-}
-function runbuildsh(){
-    if [ -x "${2}/${1}" ]; then
-            prn "Running $1"
-            cd "${2}" || err "Running $1 has failed, check your permissions."
+run_package_script() {
+    {
+        if [ -x "${2}/${1}" ]; then
+            echo ":: Running ${1}"
+            #cd "${2}" || die "Could not enter package working directory. Exiting..."
             "${2}/${1}" "${2}/payload" "${2}"
-    fi 
+        fi
+    }
 }
-function pkg_find(){
-    # i could not even bother, i had to copy kiss in some sense
-    set -- "$1" "$2" "$3" "${4:-"$AL_REPO"}"
-    IFS=:
-
-    for _find_path in $4 "${3:-$sys_db}"; do set +f
-        for _find_pkg in "$_find_path/"$1; do
-            test "${3:--d}" "$_find_pkg" && set -f -- "$@" "$_find_pkg"
-        done
-    done
-
-    unset IFS
-    # alnux search i guess
-    #case $2-$# in
-    #    *-4) return 1 ;;
-    #     -*) repo_dir=$5; repo_name=${5##*/} ;;
-    #      *) shift 4; printf '%s\n' "$@"
-    #esac
-}
-function pkg_local(){
-    #if [ -z "$AL_REPO" ]; then
-    #    err "Alnux Repo variable is not set. Will not continue"
-    #fi
-    pkg_find $1
+install_local_package() {
+    [ ! -e "${1}" ] && die "File ${1} does not exist. Exiting..."
+    # Extract the package
+    confirm
+    echo ":: Installing package ${1}"
     cp -prv "${1}" "${temp_location}"
-
-    # - - - - - #
-    # VARIABLES #
-    # - - - - - #
     pkg_name="${1%/}"
     pkg_name="${pkg_name##*/}"
     pkg_name=$(echo "${pkg_name}" | cut -f 1 -d '.')
     pkg_path="${temp_location}/${pkg_name}"
-    # - - #
-    #     # 
-    # - - #
+    cd "${pkg_path}" || die "Could not enter package path."
+    # Set default values for package
+    pkg_config_deploy=true
+    pkg_config_ver="0"
+    pkg_config_makedepends=""
+    pkg_config_depends=""
+    # Download sources.
+    if [ -f sources ]; then
+    	pkg_config_sources=$(cat sources)
+    	pkg_config_sources_to=$(echo ${pkg_config_sources} | sed 's:.*/::')	
+    	curl -# ${pkg_config_sources} -o ${pkg_config_sources_to}
+    	mkdir pkg_bd
+	tar -xf 1 ${pkg_config_sources_to} -C ${pkg_path}
+    fi
+    # Install package
     mkdir -p "${pkg_path}/payload"
     . "${pkg_path}/package"
-    cd "${pkg_path}"
-    if [ -f sources ]; then
-        sources "$(cat ${pkg_path}/sources)"
-            #"$(cat *.sources)"
-    fi
-    # for SOURCES in *.sources; do sources "$(cat $SOURCES)"; done
-    for SHASUM in *.sha256sum; do sha256 "$(cat $SHASUM)"; done
-    runbuildsh "build" "${pkg_path}/pkgsrc"
-    runbuildsh "predeploy" "${pkg_path}/pkgsrc"
-    # Old APS code from before the rewrite!
+    cd pkg_bd/
+    run_package_script "build" "${pkg_path}"
+    cd ../..
+    run_package_script "predeploy" "${pkg_path}"
     # Deploy package
     if [ "${pkg_config_deploy}" = true ]; then
-        prn "Deploying target ${pkg_name}..."
+        echo ":: Deploying target ${pkg_name}..."
         cp -rpv "${pkg_path}/payload"/* "${install_root}" > "${temp_location}/${pkg_name}-payloaddeploylog"
         sed 's/^.*-> //' "${temp_location}/${pkg_name}-payloaddeploylog" | tr -d \'\" > "${temp_location}/${pkg_name}-payloadfiles"
         rm "${temp_location}/${pkg_name}-payloaddeploylog"
     fi
-    runbuildsh "postdeploy" "${pkg_path}/pkgsrc"
-    # Yet more old APS code
+    run_package_script "postdeploy" "${pkg_path}"
+    # Add package to database
     if [ -x "${pkg_path}/package" ]; then
-        prn "Adding target ${pkg_name} to installed package database..."
-        [ ! -d "${installed_pkg_database}/${pkg_name}" ] && mkdir -p "${installed_pkg_database}/${pkg_name}"
+        echo ":: Adding target ${pkg_name} to installed package database..."
+        [ ! -d "${installed_pkg_database}/${pkg_name}" ] && mkdir "${installed_pkg_database}/${pkg_name}"
         cp -pv "${pkg_path}/package" "${installed_pkg_database}/${pkg_name}/package"
         [ -e "${temp_location}/${pkg_name}-payloadfiles" ] && cp -pv "${temp_location}/${pkg_name}-payloadfiles" "${installed_pkg_database}/${pkg_name}/payloadfiles"
     else
-        err "Target ${pkg_name} does not have a package script (it's an invalid package!). Exiting..."
+        die "Target ${pkg_name} does not have a package script (it's an invalid package!). Exiting..."
     fi
-    # Old Cleanup, might work
+    # Cleanup
     rm -r "${pkg_path}"
     rm "${temp_location}/${pkg_name}-payloadfiles"
-    cd "${install_root}" || err "Could not return to main directory. Exiting..."
+    cd "${install_root}" || die "Could not return to main directory. Exiting..."
     unset pkg_path
     unset pkg_name
     unset pkg_config_deploy
     unset pkg_config_ver
     unset pkg_config_makedepends
     unset pkg_config_depends
-    prn "Install complete for package ${pkg_name}"
+    echo "[*] Install complete for package ${pkg_name}"
+}
+sync_deps(){
+    confirm
+    echo ":: Syncing dependencies for ${1}"
+    install_package_from_repo "${pkg_makedepends}"
+    install_package_from_repo "${pkg_deps}"
+    echo "[*] Install dependencies for ${1}"
+
+}
+remove_local_package() {
+    confirm
+    echo ":: Removing target ${1}..."
+    pkg_path="${installed_pkg_database}/${1}"
+    [ ! -d "${pkg_path}" ] && die "Package could not be found in local installed package database. Exiting..."
+    payloadfiles_path="${pkg_path}/payloadfiles"
+    [ ! -e "${payloadfiles_path}" ] && die "[E] Package ${1} does not have a payloadfiles file. Exiting..."
+    rm -rv "$(cat ${payloadfiles_path})"
+    rm -rv "${pkg_path}"
+    echo "[*] Removal complete for target ${pkg_name}"
 }
 sync_local_repo_database() {
-    # Local database for repo already exists - sync it
-    #cd "${1}" || err "Could not enter local database directory. Exiting..."
-    #git pull
-    prn "Syncing local database for $1"
+    echo ":: Syncing local database for repo ${1}"
     if [ ! -d "${locpkg_database}/${1}" ]; then
         # Local database for repo doesnt exists - clone it
         git clone "${2}" "${locpkg_database}/${1}"
     else
         # Local database for repo already exists - sync it
-        cd "${locpkg_database}/${1}" || err "Could not enter local database directory. Exiting..."
+        cd "${locpkg_database}/${1}" || die "Could not enter local database directory. Exiting..."
         git pull
     fi
 }
-install_package_from_repo(){ # NOTE(hippoz): This can get a tad confusing... ${1} is the repo and ${2} is the package
-    prn "Installing package(s) ${2} from ${1} repo"
-    pkg_local "${locpkg_database}/${1}/${2}"
-    [ ! -d "${locpkg_database}/${1}/${2}" ] && err "Target not found."
+install_package_from_repo() { # NOTE(hippoz): This can get a tad confusing... ${1} is the repo and ${2} is the package
+    echo ":: Installing package ${2} from ${1} repo"
+    [ ! -d "${locpkg_database}/${1}/${2}" ] && die "Target not found."
+    install_local_package "${locpkg_database}/${1}/${2}"
 }
-update() {
-    prn "Upgrading installed packages"
-    cd "${installed_pkg_database}" || err "Could not enter local installed package database directory. Exiting..."
+upgrade() {
+    confirm
+    echo ":: Upgrading installed packages"
+    cd "${installed_pkg_database}" || die "Could not enter local installed package database directory. Exiting..."
     for pkg in */; do
         installed_pkg_path="${installed_pkg_database}/${pkg}"
         . "${installed_pkg_path}/package"
@@ -211,36 +163,46 @@ update() {
         unset pkg_config_depends
     done
 }
-function help(){
-    prn "h|help) prints this message"
-    prn "v|version) version"
-    prn "s|sync) install package(s), and sync repositories"
-    prn "u|update) update"
-    prn "i|install) install LOCAL package(s)"
+version(){
+	echo "Alnux APS v0.0.8.1"
 }
-function version(){
-    prn "APS Version 0.1.0"
+help(){
+	echo "Alnux APS, the packaging system for Alnux."
+        echo ""
+	echo "sync    - Synchronizes from package repository."
+	echo "install - Installs from local package information file and build file."
+	echo "upgrade - Upgrades from package repository."
+	echo "remove  - Removes a package from /var/aps/installed and it's install files (payloadfiles)."
+	echo "list    - Lists currently installed packages."
+	echo "help    - Display this message."
+	echo "version - Display the version."
 }
-function main(){
+list(){
+	ls ${installed_pkg_database} | sed 's/^README.md//g'
+}
+main() {
     if [ -f "${lock}" ]; then
-        err "A lock file already exists (another instance of the package manager could be running). If you're sure no package manager is running, remove the file ${lock}."    
+        echo "A lock file already exists (another instance of the package manager could be running). If you're sure no package manager is running, remove the file ${lock}."
+        exit 1
     fi
     touch "${lock}"
-    case $1 in
-        s|sync) sync_local_repo_database "${official}" ${official}
+    case ${1} in
+        install) install_local_package "${2}" ;;
+        remove) remove_local_package "${2}" ;;
+        #sync-dep)
+        #    sync_local_repo_database "official" ${official}
+        #    [ -z "${2}" ] && exit 0
+        #    install_package_from_repo "official" "${2}" ;;
+        sync)
+            sync_local_repo_database "official" ${official}
             [ -z "${2}" ] && exit 0
-            install_package_from_repo "${official}" "${@: -1}" 
-            confirm ;;
-        i|install) pkg_local ${*: -1} 
-                    confirm ;;
-        u|update) update 
-                    confirm ;;
-        v|version) version ;;
-        h|help) help ;;
-        apsinst) if [ $APS_PKG=y ]; then 
-                    install -v aps
-        *) err "Invalid option"
+            install_package_from_repo "official" "${2}" ;;
+        upgrade) upgrade "official" ;;
+	help) help ;;
+	version) version ;;
+	list) list ;;
+        *) die "Invalid option ${1}, exiting..." ;;
     esac
-    rm ${lock}
+    rm "${lock}"
 }
-main $1 ${@: -1}
+main "${1}" "${2}"

config/config

@@ -4,7 +4,7 @@
 # Alnux Packaging System #
 ##########################
 temp_location="/var/tmp"
-install_root="/var/tmp/alroot"
+install_root="/"
 installed_pkg_database="${install_root}/var/aps/installed"
 locpkg_database="${install_root}/var/aps/repos"
 lock="${install_root}/var/aps/lock"

man/alnux-pkg-standard.7.md

@@ -1,10 +0,0 @@
-alnux-pkg-standard(7)
-# APS/Alnux packaging standard
-# file structure:  
-- build (Shell/DSL)  
-- sha256 (DSL, seperate files for every sum)  
-- sources (DSL, seperate files for every source)  
-- package (DSL, variable)  
-# expectations, and alnux:  
-alnux is probably a diffrent distro than KISS. So don't try to install KISS packages on AL.  
-

man/aps.8.md

@@ -1,7 +0,0 @@
-aps(8)
-# APS version 0.1.0
-# Patching APS:  
-either make a (.diff, .patch., .fix) file, sign it, mail it, or  
-mail it without the patch file, just the fix. (Mail it to APS dev team of course.)  
-# Packaging:  
-visit alnux-pkg-standard.7 for further info.

man/chroot-al.1.md

@@ -1,4 +0,0 @@
-chroot-al(1)
-# Alnux Chroot
-Alnux chroot serves a simple purpose, portable to any system;
-chroot into a system with rebinded system directories.

man/manmake.sh

@@ -1,27 +0,0 @@
-# clean everything
-function clean(){
-   set -x
-   rm aps.8
-   rm alnux-pkg-standard.7
-   rm sel.7
-   rm repo.7
-   rm mkinitramfs.8
-   rm chroot-al.1
-}
-function scdocbuild(){
-   set -x
-   scdoc < aps.8.md > aps.8 
-   scdoc < alnux-pkg-standard.7.md > alnux-pkg-standard.7
-   scdoc < sel.7.md > sel.7
-   scdoc < repo.7.md > repo.7
-   scdoc < mkinitramfs.8.md > mkinitramfs.8
-   scdoc < chroot-al.1.md > chroot-al.1
-}
-function main(){
-    case $1 in
-        scdocbuild) scdocbuild ;;
-        clean) clean ;;
-        *) scdocbuild ;;
-    esac
-}
-main $1

man/mkinitramfs.8.md

@@ -1,3 +0,0 @@
-mkinitramfs(7)
-# mkinitramfs
-Alnux's mkinitramfs, it does not accept ANY flags, it's just there to make the initramfs.

man/repo.7.md

@@ -1,3 +0,0 @@
-repo(7)
-# repo
-Can be used to manage repositories for aps.

man/sel.7.md

@@ -1,4 +0,0 @@
-sel(7)
-# sel
-A alnux select script, can be used for symlinking your linux version and to
-write a linux package for aps.