diff --git a/completions/shsh.fish b/completions/shsh.fish index 991c595..785c196 100644 --- a/completions/shsh.fish +++ b/completions/shsh.fish @@ -73,7 +73,6 @@ complete -f -c shsh -n "__fish_shsh_using_command install" -l noconfirm -d "do n complete -f -c shsh -n "__fish_shsh_using_command install" -l ssh -d "use ssh protocal instead of https" complete -f -c shsh -n "__fish_shsh_using_command install" -l plain -d "build a plain package from the ground up" complete -f -c shsh -n "__fish_shsh_using_command install" -l gh-release -d "download binary from github release assets" -complete -f -c shsh -n "__fish_shsh_using_command install" -l archpkg -d "install the package as an Arch/AUR package" complete -f -c shsh -n "__fish_shsh_using_command uninstall" -l quiet -d "be quiet even if package does not exists" complete -f -c shsh -n "__fish_shsh_using_command uninstall" -l use-rc -d "uninstall all packages not present in SHSHRC" diff --git a/libexec/shsh b/libexec/shsh index b945657..f44f80c 100755 --- a/libexec/shsh +++ b/libexec/shsh @@ -116,7 +116,7 @@ for arg; do ;; --version) cat << EOF -shsh (shell script handler) v3.0.0 +shsh (shell script handler) v3.0.1 Copyright (c) 2014 Juan Ibiapina, 2020 Tin Lai (@soraxas) This is free software; see the source for copying conditions. There is NO diff --git a/libexec/shsh-_env-var b/libexec/shsh-_env-var index c24de08..ce0151f 100644 --- a/libexec/shsh-_env-var +++ b/libexec/shsh-_env-var @@ -38,7 +38,6 @@ export SHSH_PREFIX="${SHSH_PREFIX:=$SHSH_ROOT/cellar}" export SHSH_PACKAGES_PATH="${SHSH_PACKAGES_PATH:=$SHSH_PREFIX/packages}" export SHSH_INSTALL_BIN="${SHSH_INSTALL_BIN:=$SHSH_PREFIX/bin}" export SHSH_INSTALL_MAN="${SHSH_INSTALL_MAN:=$SHSH_PREFIX/man}" -export SHSH_INSTALL_ARCHPKG_ROOT="${SHSH_INSTALL_ARCHPKG_ROOT:=$SHSH_ROOT/cellar/archpkg_root}" _xdg_config_home="${XDG_CONFIG_HOME:=$HOME/.config}" export SHSHRC="${SHSHRC:=$_xdg_config_home/shshrc}" @@ -47,4 +46,4 @@ export PATH="${bin_path}:${PATH}" export UTILS_FUNC="$bin_path/shsh-_utils" export SHSH_JUNEST_ROOT="$SHSH_ROOT/cellar/arch_junest_root" -export SHSH_JUNEST_BIN="$SHSH_JUNEST_ROOT/junest_bin" \ No newline at end of file +export SHSH_JUNEST_BIN="$SHSH_JUNEST_ROOT/junest_bin" diff --git a/libexec/shsh-_utils b/libexec/shsh-_utils index 7f4f3d4..3f77ee2 100755 --- a/libexec/shsh-_utils +++ b/libexec/shsh-_utils @@ -340,14 +340,9 @@ EOF # fi _folder_namespace="$1" _folder_target="$1" - [ "$operation" = "archpkg" ] && _folder_namespace="_archpkg" info_echo "> Going to use '$_folder_namespace/$_folder_target' as the install folder" ;; esac - if [ -n "$operation" ] && [ "$operation" != "archpkg" ] && [ "$_folder_namespace" = "_archpkg" ]; then - error_echo "> The '_archpkg' namespace is reserved and cannot be used." - exit 1 - fi _folder_full="$_folder_namespace/$_folder_target" export _folder_namespace export _folder_target @@ -401,24 +396,6 @@ if ! command_exists jq; then } fi -get_archlinux_makepkg() { - _makepkg_path="$(shsh package-path _bootstrap/archmakepkg)" || true - - if [ -z "$_makepkg_path" ]; then - # bootstrap custom makepkg - info_echo "> Installing custom arch makepkg" - - # no linking - shsh install soraxas/archlinux-makepkg-stripped _bootstrap/archmakepkg -v BINS='' >/dev/null 2>&1 - _makepkg_path="$(shsh package-path _bootstrap/archmakepkg)" || true - if [ -z "$_makepkg_path" ]; then - error_echo "> error in bootstrapping makepkg" - exit 1 - fi - fi - echo "$_makepkg_path/makepkg" -} - parse_hooks_and_setvar() { echo_if_verbose ">> parsing install command: '$*'" # shellcheck disable=SC2116,SC2028 diff --git a/libexec/shsh-install b/libexec/shsh-install index 9ee42eb..b799252 100755 --- a/libexec/shsh-install +++ b/libexec/shsh-install @@ -24,7 +24,6 @@ # flag implies --plain # TODO: currently it is bias towards linux and amd64; # to-be generalised towards detecting current arch. -# --arch[pkg] install the as Arch package (or AUR) # -f, --force force the installation even if the package exists # --ssh use ssh protocal instead of https # @@ -90,17 +89,10 @@ if [ "$#" != 0 ]; then --ssh) use_ssh="true" ;; - --arch|--archpkg) - archpkg="true" - ;; --nocleanup) no_cleanup="true" export no_cleanup ;; - --noconfirm) - SHSH_ARCHPKG_NOCONFIRM="true" - export SHSH_ARCHPKG_NOCONFIRM - ;; -f|--force) force_install="true" ;; @@ -146,10 +138,6 @@ fi ############################################################ -if [ -n "$2" ] && [ -n "$archpkg" ]; then - error_echo "> Arch/AUR package cannot use custom folder name." - exit 1 -fi # custom folder name parse_install_folder "$2" "$operation" && package="$_folder_full" @@ -158,15 +146,13 @@ parse_install_folder "$2" "$operation" && package="$_folder_full" ########################################## if [ -n "$plain_package" ]; then operation="plain" -elif [ -n "$archpkg" ]; then - operation="archpkg" else operation="gitclone" fi case "$operation" in ######### - plain|archpkg) + plain) if [ -z "$package" ]; then # extract ref if it exists ref="" @@ -255,10 +241,6 @@ case "$operation" in # plain package or github-release mkdir -p "${SHSH_PACKAGES_PATH}/$package" ;; - archpkg) - mkdir -p "${SHSH_PACKAGES_PATH}/$package" - shsh-_install-archpkg "$1" "$package" - ;; gitclone) # only perform link if clone is successful (and package not exists before) if ! shsh-_clone "$use_ssh" "$site" "$gitrepo" "$ref" "$package"; then @@ -284,11 +266,7 @@ fi # add successfully installed package to shshrc if [ -e "$SHSHRC" ]; then set +e # allow non-zero exit status in pattern matching - if [ "$operation" = "archpkg" ]; then - _target_package="$1" - else - _target_package="$package" - fi + _target_package="$package" shshrc_get_existing_install_cmd "$_target_package" new_statement="shsh install $original_args" diff --git a/libexec/shsh-list b/libexec/shsh-list index 1e97664..262c129 100755 --- a/libexec/shsh-list +++ b/libexec/shsh-list @@ -44,8 +44,6 @@ for package_path in "${SHSH_PACKAGES_PATH}"/*/*; do else extra_info="gh-release: unknown (missing jq)" fi - elif [ "$username" = "_archpkg" ]; then - extra_info="Arch-package: $package" else # is a plain package extra_info="plain package" diff --git a/libexec/shsh-uninstall b/libexec/shsh-uninstall index adf9c38..ec671c5 100755 --- a/libexec/shsh-uninstall +++ b/libexec/shsh-uninstall @@ -78,7 +78,6 @@ fi shsh-_unlink-man "$package" shsh-_unlink-bins "$package" shsh-_unlink-completions "$package" -shsh-_unlink-archpkg "$package" [ -n "$SHSH_HOOK_UNINSTALL" ] && execute_hooks "uninstall-hook" "$SHSH_PACKAGES_PATH/$package" "$SHSH_HOOK_UNINSTALL" rm -rf "${SHSH_PACKAGES_PATH:?}/$package" diff --git a/man/man1/shsh-cleanup.1 b/man/man1/shsh-cleanup.1 index 9f4e041..ac3dc12 100644 --- a/man/man1/shsh-cleanup.1 +++ b/man/man1/shsh-cleanup.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH SHSH "1" "May 2023" "shell script handler v3.0.0" "User Commands" +.TH SHSH "1" "May 2023" "shell script handler v3.0.1" "User Commands" .SH NAME -shsh \- manual page for shsh v3.0.0 +shsh \- manual page for shsh v3.0.1 .SH SYNOPSIS .B shsh \fI\,cleanup \/\fR[\fI\,-d|--dry\/\fR] diff --git a/man/man1/shsh-commands.1 b/man/man1/shsh-commands.1 index 7dfc999..5f72c4d 100644 --- a/man/man1/shsh-commands.1 +++ b/man/man1/shsh-commands.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH SHSH "1" "May 2023" "shell script handler v3.0.0" "User Commands" +.TH SHSH "1" "May 2023" "shell script handler v3.0.1" "User Commands" .SH NAME -shsh \- manual page for shsh v3.0.0 +shsh \- manual page for shsh v3.0.1 .SH SYNOPSIS .B shsh \fI\,commands\/\fR diff --git a/man/man1/shsh-completions.1 b/man/man1/shsh-completions.1 index 0952759..bbe0b9e 100644 --- a/man/man1/shsh-completions.1 +++ b/man/man1/shsh-completions.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH SHSH "1" "May 2023" "shell script handler v3.0.0" "User Commands" +.TH SHSH "1" "May 2023" "shell script handler v3.0.1" "User Commands" .SH NAME -shsh \- manual page for shsh v3.0.0 +shsh \- manual page for shsh v3.0.1 .SH SYNOPSIS .B shsh \fI\,completions \/\fR diff --git a/man/man1/shsh-edit.1 b/man/man1/shsh-edit.1 index 5f82cde..3f1048c 100644 --- a/man/man1/shsh-edit.1 +++ b/man/man1/shsh-edit.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH SHSH "1" "May 2023" "shell script handler v3.0.0" "User Commands" +.TH SHSH "1" "May 2023" "shell script handler v3.0.1" "User Commands" .SH NAME -shsh \- manual page for shsh v3.0.0 +shsh \- manual page for shsh v3.0.1 .SH SYNOPSIS .B shsh \fI\,edit\/\fR diff --git a/man/man1/shsh-get.1 b/man/man1/shsh-get.1 index a9c1448..b9a7103 100644 --- a/man/man1/shsh-get.1 +++ b/man/man1/shsh-get.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH SHSH "1" "May 2023" "shell script handler v3.0.0" "User Commands" +.TH SHSH "1" "May 2023" "shell script handler v3.0.1" "User Commands" .SH NAME -shsh \- manual page for shsh v3.0.0 +shsh \- manual page for shsh v3.0.1 .SH SYNOPSIS .B shsh \fI\,get \/\fR diff --git a/man/man1/shsh-help.1 b/man/man1/shsh-help.1 index 0e32133..1a5cfcc 100644 --- a/man/man1/shsh-help.1 +++ b/man/man1/shsh-help.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH SHSH "1" "May 2023" "shell script handler v3.0.0" "User Commands" +.TH SHSH "1" "May 2023" "shell script handler v3.0.1" "User Commands" .SH NAME -shsh \- manual page for shsh v3.0.0 +shsh \- manual page for shsh v3.0.1 .SH SYNOPSIS .B shsh \fI\,help \/\fR[\fI\,--usage\/\fR] \fI\,COMMAND\/\fR diff --git a/man/man1/shsh-init.1 b/man/man1/shsh-init.1 index baa69c3..b6c2872 100644 --- a/man/man1/shsh-init.1 +++ b/man/man1/shsh-init.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH SHSH "1" "May 2023" "shell script handler v3.0.0" "User Commands" +.TH SHSH "1" "May 2023" "shell script handler v3.0.1" "User Commands" .SH NAME -shsh \- manual page for shsh v3.0.0 +shsh \- manual page for shsh v3.0.1 .SH SYNOPSIS .B eval \fI\,"$(shsh init SHELL)"\/\fR diff --git a/man/man1/shsh-install.1 b/man/man1/shsh-install.1 index d72c92b..749d87e 100644 --- a/man/man1/shsh-install.1 +++ b/man/man1/shsh-install.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH SHSH "1" "May 2023" "shell script handler v3.0.0" "User Commands" +.TH SHSH "1" "May 2023" "shell script handler v3.0.1" "User Commands" .SH NAME -shsh \- manual page for shsh v3.0.0 +shsh \- manual page for shsh v3.0.1 .SH SYNOPSIS .B shsh \fI\,install \/\fR[\fI\,site\/\fR]\fI\,/\/\fR[\fI\,@ref\/\fR] [\fI\,/\/\fR] @@ -42,8 +42,6 @@ flag implies \fB\-\-plain\fR TODO: currently it is bias towards linux and amd64; .IP to\-be generalised towards detecting current arch. -.HP -\fB\-\-arch[pkg]\fR install the as Arch package (or AUR) .TP \fB\-f\fR, \fB\-\-force\fR force the installation even if the package exists diff --git a/man/man1/shsh-junest.1 b/man/man1/shsh-junest.1 index c8c47c7..580064c 100644 --- a/man/man1/shsh-junest.1 +++ b/man/man1/shsh-junest.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH SHSH "1" "May 2023" "shell script handler v3.0.0" "User Commands" +.TH SHSH "1" "May 2023" "shell script handler v3.0.1" "User Commands" .SH NAME -shsh \- manual page for shsh v3.0.0 +shsh \- manual page for shsh v3.0.1 .SH SYNOPSIS .B shsh \fI\,junest \/\fR[\fI\,-h|--help\/\fR] \fI\,\/\fR diff --git a/man/man1/shsh-link.1 b/man/man1/shsh-link.1 index 5dc34bc..6236011 100644 --- a/man/man1/shsh-link.1 +++ b/man/man1/shsh-link.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH SHSH "1" "May 2023" "shell script handler v3.0.0" "User Commands" +.TH SHSH "1" "May 2023" "shell script handler v3.0.1" "User Commands" .SH NAME -shsh \- manual page for shsh v3.0.0 +shsh \- manual page for shsh v3.0.1 .SH SYNOPSIS .B shsh \fI\,link \/\fR[\fI\,--no-deps\/\fR] \fI\, \/\fR[\fI\,-h|--hook \/\fR] [\fI\,-v|--variable =\/\fR] diff --git a/man/man1/shsh-list.1 b/man/man1/shsh-list.1 index 22c0840..8b6ba9f 100644 --- a/man/man1/shsh-list.1 +++ b/man/man1/shsh-list.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH SHSH "1" "May 2023" "shell script handler v3.0.0" "User Commands" +.TH SHSH "1" "May 2023" "shell script handler v3.0.1" "User Commands" .SH NAME -shsh \- manual page for shsh v3.0.0 +shsh \- manual page for shsh v3.0.1 .SH SYNOPSIS .B shsh \fI\,list \/\fR[\fI\,-d|--details\/\fR] diff --git a/man/man1/shsh-outdated.1 b/man/man1/shsh-outdated.1 index 57751e7..e67e1aa 100644 --- a/man/man1/shsh-outdated.1 +++ b/man/man1/shsh-outdated.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH SHSH "1" "May 2023" "shell script handler v3.0.0" "User Commands" +.TH SHSH "1" "May 2023" "shell script handler v3.0.1" "User Commands" .SH NAME -shsh \- manual page for shsh v3.0.0 +shsh \- manual page for shsh v3.0.1 .SH SYNOPSIS .B shsh \fI\,outdated \/\fR[\fI\,-q|--quiet\/\fR] diff --git a/man/man1/shsh-package-path.1 b/man/man1/shsh-package-path.1 index 08ce1b7..dfb4592 100644 --- a/man/man1/shsh-package-path.1 +++ b/man/man1/shsh-package-path.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH SHSH "1" "May 2023" "shell script handler v3.0.0" "User Commands" +.TH SHSH "1" "May 2023" "shell script handler v3.0.1" "User Commands" .SH NAME -shsh \- manual page for shsh v3.0.0 +shsh \- manual page for shsh v3.0.1 .SH SYNOPSIS .B source \fI\,"$(shsh package-path )/file.sh"\/\fR diff --git a/man/man1/shsh-refresh.1 b/man/man1/shsh-refresh.1 index 91f2ba6..9d1492f 100644 --- a/man/man1/shsh-refresh.1 +++ b/man/man1/shsh-refresh.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH SHSH "1" "May 2023" "shell script handler v3.0.0" "User Commands" +.TH SHSH "1" "May 2023" "shell script handler v3.0.1" "User Commands" .SH NAME -shsh \- manual page for shsh v3.0.0 +shsh \- manual page for shsh v3.0.1 .SH SYNOPSIS .B shsh \fI\,refresh \/\fR[\fI\,--verbose\/\fR] [\fI\,-a|--all\/\fR] diff --git a/man/man1/shsh-self-upgrade.1 b/man/man1/shsh-self-upgrade.1 index 73257c5..8b2a528 100644 --- a/man/man1/shsh-self-upgrade.1 +++ b/man/man1/shsh-self-upgrade.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH SHSH "1" "May 2023" "shell script handler v3.0.0" "User Commands" +.TH SHSH "1" "May 2023" "shell script handler v3.0.1" "User Commands" .SH NAME -shsh \- manual page for shsh v3.0.0 +shsh \- manual page for shsh v3.0.1 .SH SYNOPSIS .B shsh \fI\,self-upgrade\/\fR diff --git a/man/man1/shsh-uninstall.1 b/man/man1/shsh-uninstall.1 index d0cf441..9d493b4 100644 --- a/man/man1/shsh-uninstall.1 +++ b/man/man1/shsh-uninstall.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH SHSH "1" "May 2023" "shell script handler v3.0.0" "User Commands" +.TH SHSH "1" "May 2023" "shell script handler v3.0.1" "User Commands" .SH NAME -shsh \- manual page for shsh v3.0.0 +shsh \- manual page for shsh v3.0.1 .SH SYNOPSIS .B shsh \fI\,uninstall \/\fR diff --git a/man/man1/shsh-upgrade.1 b/man/man1/shsh-upgrade.1 index 1078047..6a62ac4 100644 --- a/man/man1/shsh-upgrade.1 +++ b/man/man1/shsh-upgrade.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH SHSH "1" "May 2023" "shell script handler v3.0.0" "User Commands" +.TH SHSH "1" "May 2023" "shell script handler v3.0.1" "User Commands" .SH NAME -shsh \- manual page for shsh v3.0.0 +shsh \- manual page for shsh v3.0.1 .SH SYNOPSIS .B shsh \fI\,upgrade \/\fR[\fI\,-f|--force\/\fR] diff --git a/man/man1/shsh.1 b/man/man1/shsh.1 index 8b24b06..e09f1de 100644 --- a/man/man1/shsh.1 +++ b/man/man1/shsh.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH SHSH "1" "May 2023" "shell script handler v3.0.0" "User Commands" +.TH SHSH "1" "May 2023" "shell script handler v3.0.1" "User Commands" .SH NAME -shsh \- manual page for shsh v3.0.0 +shsh \- manual page for shsh v3.0.1 .SH SYNOPSIS .B shsh \fI\, \/\fR[\fI\,\/\fR] [\fI\,--verbose\/\fR] [\fI\,--help\/\fR] @@ -175,8 +175,6 @@ flag implies \fB\-\-plain\fR TODO: currently it is bias towards linux and amd64; .IP to\-be generalised towards detecting current arch. -.HP -\fB\-\-arch[pkg]\fR install the as Arch package (or AUR) .TP \fB\-f\fR, \fB\-\-force\fR force the installation even if the package exists