diff --git a/aps b/aps index c7bb9a1..435a0de 100755 --- a/aps +++ b/aps @@ -52,11 +52,9 @@ function notf(){ echo -e "\e[34m==>\e[36m NOTIFICATION:\e[39m $1" } function confirm(){ - prn "To $1, press ENTER, to cancel, press CTRL+C" + prn "To continue press ENTER, or to exit CTRL-C" + read -p } -#function dbg(){ -# wrn "This is a debug build, that may not work!" -#} function sources(){ pkg_config_url="$1" pkg_config_url_prefix=$(echo ${pkg_config_url} | cut -d'+' -f1) @@ -71,11 +69,12 @@ function sources(){ *.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) prwork + *.gz) cd pkgex && gzip -d ../${pkg_config_archv} && cd .. ;; + *) ;; esac mkdir --parents pkgsrc cp -r pkgex/*/* pkgsrc ;; - *) wrn "Old Alnux sources is probably used!" + *) err "Old Alnux sources is probably used!" esac } @@ -161,8 +160,8 @@ function pkg_local(){ err "Target ${pkg_name} does not have a package script (it's an invalid package!). Exiting..." fi # Old Cleanup, might work - #rm -r "${pkg_path}" - #rm "${temp_location}/${pkg_name}-payloadfiles" + rm -r "${pkg_path}" + rm "${temp_location}/${pkg_name}-payloadfiles" cd "${install_root}" || err "Could not return to main directory. Exiting..." unset pkg_path unset pkg_name @@ -227,16 +226,15 @@ function main(){ 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}." fi touch "${lock}" - #dbg case $1 in s|sync) sync_local_repo_database "${official}" ${official} [ -z "${2}" ] && exit 0 - install_package_from_repo "${official}" "${@: -1}" ;; - #confirm "install" ;; - i|install) pkg_local ${*: -1} ;; - # confirm "install" ;; - u|update) update ;; - # confirm "update" ;; + 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 diff --git a/man/alnux-pkg-standard.7.md b/man/alnux-pkg-standard.7.md new file mode 100644 index 0000000..318402b --- /dev/null +++ b/man/alnux-pkg-standard.7.md @@ -0,0 +1,9 @@ +#### 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. \ + diff --git a/man/aps.8 b/man/aps.8 deleted file mode 100644 index 6d46904..0000000 --- a/man/aps.8 +++ /dev/null @@ -1,11 +0,0 @@ -aps(v0.1.0) aps(v0.1.0) - - - -aappss -- aallnnuuxx ppaacckkaaggee mmaannaaggeerr - To submit patches, contact the alnux dev team via mail (mailing list). - If you need help refer to the wiki - - - - aps(v0.1.0) diff --git a/man/aps.8.md b/man/aps.8.md new file mode 100644 index 0000000..ebdf534 --- /dev/null +++ b/man/aps.8.md @@ -0,0 +1,4 @@ +#### APS version 0.1.0 +to patch aps, mail the alnux dev team the patch.\ +for pkg standards, visit alnux-pkg-standard.7. \ +Note: APS contains some old code still, it's been updated to support alot of standards. \ \ No newline at end of file diff --git a/man/manmake.sh b/man/manmake.sh new file mode 100755 index 0000000..d4446e7 --- /dev/null +++ b/man/manmake.sh @@ -0,0 +1,19 @@ +# clean everything +function clean(){ + set -x + rm aps.8 + rm alnux-pkg-standard.7 +} +function panbuild(){ + set -x + pandoc aps.8.md -f markdown -t man -o aps.8 -s + pandoc alnux-pkg-standard.7.md -f markdown -t man -o alnux-pkg-standard.7 -s +} +function main(){ + case $1 in + panbuild) panbuild ;; + clean) clean ;; + *) panbuild ;; + esac +} +main $1 \ No newline at end of file