From 8c7a5d0e3a9fa680eabd162d3529b05bd5bcb2c1 Mon Sep 17 00:00:00 2001
From: Ohio2 <sekmartyna4@gmail.com>
Date: Sun, 29 Aug 2021 13:26:05 +0200
Subject: [PATCH 1/3] uhhh

---
 aps | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/aps b/aps
index ef12f79..bfd7103 100755
--- a/aps
+++ b/aps
@@ -7,7 +7,7 @@
 
 if [ -f "$XDG_CONFIG_HOME/al/config" ]; then
 	. $XDG_CONFIG_HOME/al/config
-elif [ -f "$HOME/.config/al/config"]; then
+elif [ -f "$HOME/.config/al/config" ]; then
 	. $HOME/.config/al/config
 elif [ -f "/etc/al/config" ]; then
 	. /etc/al/config
@@ -18,7 +18,7 @@ else
 	locpkg_database="${install_root}/var/aps/repos"
 	lock="${install_root}/var/aps/lock"
 	official="https://git.hippoz.xyz/alnux/repo"
-	debug=off	
+	debug=off
 fi
 if [ ${debug} = on ]; then
 	set -x
@@ -47,7 +47,7 @@ run_package_script() {
     }
 }
 install_local_package() {
-    [ ! -e "${1}" ] && die "[E] File ${1} does not exist. Exiting..."
+    [ ! -e "${1}" ] && die "File ${1} does not exist. Exiting..."
     # Extract the package
     confirm
     echo ":: Installing package ${1}"
@@ -63,11 +63,13 @@ install_local_package() {
     pkg_config_makedepends=""
     pkg_config_depends=""
     # Download sources.
-    pkg_config_sources="$(cat sources | sed -n 1)"
-    pkg_config_sources_to="$(cat sources | sed -n 1)"
-    pkg_config_sources_to="$(echo ${pkg_config_sources_to} | sed s|.*/||)"
+    pkg_config_sources=$(cat sources)
+    #pkg_config_sources_to=$(cat sources) 
+    pkg_config_sources_to=$(echo ${pkg_config_sources} | sed 's:.*/::')
+    #pkg_config_sources_to_ex=$(echo ${pkg_config_sources_to} | sed 's/\..*$//')
     curl -# ${pkg_config_sources} -o ${pkg_config_sources_to}
-    tar -xf ${pkg_config_sources_to} ${pkg_name}
+    mkdir ${pkg_name}
+    tar -xf ${pkg_config_sources_to} -C ${pkg_name}
     cd ${pkg_name}
     # Install package
     mkdir -p "${pkg_path}/payload"
@@ -89,7 +91,7 @@ install_local_package() {
         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
-        die "[E] 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
     # Cleanup
     rm -r "${pkg_path}"
@@ -161,7 +163,7 @@ upgrade() {
     done
 }
 version(){
-	echo "Alnux APS v0.0.8"
+	echo "Alnux APS v0.0.8.1"
 }
 help(){
 	echo "Alnux APS, the packaging system for Alnux."
@@ -179,17 +181,17 @@ list(){
 }
 main() {
     if [ -f "${lock}" ]; then
-        echo "[E] 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
         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-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
@@ -198,7 +200,7 @@ main() {
 	help) help ;;
 	version) version ;;
 	list) list ;;
-        *) die "[E] Invalid option ${1}, exiting..." ;;
+        *) die "Invalid option ${1}, exiting..." ;;
     esac
     rm "${lock}"
 }
-- 
2.30.2


From 869216d3699e06db68bff860cca87aff4405301a Mon Sep 17 00:00:00 2001
From: Ohio2 <sekmartyna4@gmail.com>
Date: Tue, 31 Aug 2021 14:20:02 +0200
Subject: [PATCH 2/3] ok the bug will be fixed, once i change the build to cd
 insert cd.

---
 aps          |  19 ++++++++++---------
 install.sh   |   1 +
 man/aps.8.gz | Bin 422 -> 517 bytes
 settings     |   9 +++++++++
 4 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 settings

diff --git a/aps b/aps
index bfd7103..5a31a93 100755
--- a/aps
+++ b/aps
@@ -41,7 +41,7 @@ run_package_script() {
     {
         if [ -x "${2}/${1}" ]; then
             echo ":: Running ${1}"
-            cd "${2}" || die "Could not enter package working directory. Exiting..."
+            #cd "${2}" || die "Could not enter package working directory. Exiting..."
             "${2}/${1}" "${2}/payload" "${2}"
         fi
     }
@@ -63,18 +63,19 @@ install_local_package() {
     pkg_config_makedepends=""
     pkg_config_depends=""
     # Download sources.
-    pkg_config_sources=$(cat sources)
-    #pkg_config_sources_to=$(cat sources) 
-    pkg_config_sources_to=$(echo ${pkg_config_sources} | sed 's:.*/::')
-    #pkg_config_sources_to_ex=$(echo ${pkg_config_sources_to} | sed 's/\..*$//')
-    curl -# ${pkg_config_sources} -o ${pkg_config_sources_to}
-    mkdir ${pkg_name}
-    tar -xf ${pkg_config_sources_to} -C ${pkg_name}
-    cd ${pkg_name}
+    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_bd/
     run_package_script "build" "${pkg_path}"
+    cd ../..
     run_package_script "predeploy" "${pkg_path}"
     # Deploy package
     if [ "${pkg_config_deploy}" = true ]; then
diff --git a/install.sh b/install.sh
index 018a348..352e198 100755
--- a/install.sh
+++ b/install.sh
@@ -13,6 +13,7 @@ if [ ${prefix} == / ]; then
 	kill 2
 	fi
 else
+	export install_root=${prefix} 
 	./aps sync alnux 
 	install -v aps ${prefix}/usr/bin/ &&
 	install -v altools/sel ${prefix}/usr/bin/ &&
diff --git a/man/aps.8.gz b/man/aps.8.gz
index 974d26dac1e6ab8e84c55a39b6cf54ee5327a52a..3b747cf8584ed15d0592e4bc45fc483d4a0c1800 100644
GIT binary patch
literal 517
zcmV+g0{Z<QiwFpxaV%i~17UD;E;s;vQcZ8$FbuuxS8%>;13D!wHlWw6Nf85SV$=?>
z0lug<?Ff@4LmyeaUq8xrQWOKG6D9FIK9Y}@39JvWKNRqESf`Iaq1dK5Jf^$N2Y}SW
zZ{eUtjaGQ9;bnjms{XDM8gBX5d;X0xUTk5t+aG^Ga+^T13T<#6?v{7sP3iCot1O4}
zk}vr^kB>)(79LDTEVWA*&$qB&J#E;OTz&!i2tq+GT7<?}_?Kk_tvC6@bD9<DVb889
zH{ef5(CU|HrEb9u&SUpRLxQu6xj|Pzhl=GCo~+UG4?1Y9>1Hs3#ojpSjU70X+IgW=
z1f)|qCo5BpQYVPiRHzeP8V!w92-G6H1gYxr%30`JD{729$0__zQHz~9<EZj^3>}DT
z;)p7nw7glIg<Xi=EoPBemy5E=#@f<<bZ`+LB{=xhi$NJtkGId9DM|a9X0fBtK^3e;
z?bQHR!b?@hSv0_$zLu_6VxWmj2OT;`8JwNby4e4_1cdpSkE=`a&4yf)9}-s3UlT}O
zZK}{w-FbS(GX8zq8H@Bn(wEevMZ_@__!@^jdxeu(n^-1d;ya_}-|)RPH0zFVmb_t2
zkM>=6!oy&K1sXg~2C61|GM;7^%9(4l&&dQ@X)9?v1O!o4)IE4}!S)J0UbL~l1GrwT
HW&;2KuR`-u

literal 422
zcmV;X0a^YZiwFoHX(wR-17UD;E;s<yQcaK3Fc7`_S3Gh7q~fp@NP8{YtQu*ziAXrC
z2nUl+(r6t!vYmzgd&Vg_A#sL_qnY@9c}6w~_63ebjmKi2-#?)~<Q4AohwK%Q2mDYT
zJsEN;&<Wo!IFp{XqcXUWA8zGGDP(=X*X$dTn*_;j?q?sceZP%WZ113L`;2bT1f?CR
z(*^W%@WJDaGB%vaVK6=@(-Le4ZeUXFv+4;f!ykv%&YHyuZZ>8x{acB=!^O_89l_6h
z82blk@ay#r9F6vc7VgDJ`l4JK#wle-)`q22lTV{n$;Q8UCb+XBbDex5WOcxC_n3(o
zsCgG9W~Et?<vQ!|f970b?X&9cb6(bYaTNb-jHb(*&EK*#Y15V0KuMKl*gaH5BI<~r
zwZ_S|^GGJBFjx~OCgi6$G{K^y8u-Uxc)NMk6>3gvI{SOZ645#viHO)2yb&vUa<+GB
zWE4l@Vj`z6*VoZH@`V`M!4H8pOPcn&QbOkCO1Ln|vK0QjJX=3-a)v>*EqRY%SLCEA
Q(CSP40-jC>R=NWK089(cO8@`>

diff --git a/settings b/settings
new file mode 100644
index 0000000..64a9aa3
--- /dev/null
+++ b/settings
@@ -0,0 +1,9 @@
+UnlockClient=true
+UnlockStudio=false
+FPSCapValues=[30.000000, 60.000000, 75.000000, 120.000000, 144.000000, 165.000000, 240.000000, 360.000000]
+FPSCapSelection=0
+FPSCap=0.000000
+CheckForUpdates=true
+NonBlockingErrors=true
+SilentErrors=false
+QuickStart=false
-- 
2.30.2


From 696425afd988fe715ad46035d8d061412f01a08d Mon Sep 17 00:00:00 2001
From: Ohio2 <sekmartyna4@gmail.com>
Date: Tue, 31 Aug 2021 14:21:56 +0200
Subject: [PATCH 3/3] bro what

---
 settings | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 settings

diff --git a/settings b/settings
deleted file mode 100644
index 64a9aa3..0000000
--- a/settings
+++ /dev/null
@@ -1,9 +0,0 @@
-UnlockClient=true
-UnlockStudio=false
-FPSCapValues=[30.000000, 60.000000, 75.000000, 120.000000, 144.000000, 165.000000, 240.000000, 360.000000]
-FPSCapSelection=0
-FPSCap=0.000000
-CheckForUpdates=true
-NonBlockingErrors=true
-SilentErrors=false
-QuickStart=false
-- 
2.30.2