v3.0.0 "The Great Overhaul"
===================================================================== Notice the major version change which comes with breaking changes to 2.x! Reconstructs "library" functions for both python and zsh scwrypts, with changes to virtualenv naming conventions (you'll need to refresh all virtualenv with the appropriate scwrypt). --- Changes ------------------------------ - changed a naming convention across zsh scripts, particularly removing underscores where there is no need to avoid naming clash (e.g. 'zsh/lib/utils/io.zsh' renames '__STATUS' to 'STATUS') - moved clients reliant on py.lib.http to the py.lib.http module - python scripts now rely on py.lib.scwrypts.execute - updated package.json in zx scripts to include `type = module` - 'scwrypts --list' commandline argument now includes additional relevant data for each scwrypt - environment variables no longer add themselves to be staged in the '.env.template' --- New Features ------------------------- - new 'use' syntax for disjoint import within zsh scripts; took me a very long time to convince myself this would be necessary - introduced scwrypt "groups" to allow portable module creation; (i.e. ability add your own scripts from another repo!) - py.lib.scwrypts.io provides a combined IO stream for quick, hybrid use of input/output files and stdin/stdout - py.lib.fzf provides a wrapper to provide similar functionality to zsh/utils/io.zsh including fzf_(head|tail) - improved efficiency of various scwrypts; notably reducing runtime of scwrypts/environment sync - improved scwrypts CLI by adding new options for exact scwrypt matching, better filtering, and prettier/more-detailed interfaces --- New Scripts -------------------------- - py/twilio ) basic SMS integration with twilio - send-sms - py/directus ) interactive directus GET query - get-items - py/discord ) post message to discord channel or webhook - post-message
This commit is contained in:
18
zsh/lib/system/config/config.module.zsh
Normal file
18
zsh/lib/system/config/config.module.zsh
Normal file
@ -0,0 +1,18 @@
|
||||
#####################################################################
|
||||
|
||||
DEPENDENCIES+=()
|
||||
REQUIRED_ENV+=()
|
||||
|
||||
#####################################################################
|
||||
|
||||
DEFAULT_CONFIG="${0:a:h}/default.conf.zsh"
|
||||
|
||||
SAFE_SYMLINKS=1
|
||||
|
||||
# in case dotfiles.zsh is sourced; allows users to provide initial config
|
||||
[ ! $CONFIG__USER_SETTINGS ] \
|
||||
&& CONFIG__USER_SETTINGS="$SCWRYPTS_CONFIG_PATH/dotfiles.zsh"
|
||||
|
||||
[ ! -f "$CONFIG__USER_SETTINGS" ] && cp "$DEFAULT_CONFIG" "$CONFIG__USER_SETTINGS"
|
||||
|
||||
source "$CONFIG__USER_SETTINGS"
|
19
zsh/lib/system/config/default.conf.zsh
Normal file
19
zsh/lib/system/config/default.conf.zsh
Normal file
@ -0,0 +1,19 @@
|
||||
#
|
||||
# scwrypts dot-files config
|
||||
#
|
||||
|
||||
#TERMINFO_PATH=/path/to/sourced/terminfo/files
|
||||
|
||||
#
|
||||
# SAFE_SYMLINKS=1, makes a backup of config files that already exist
|
||||
# SAFE_SYMLINKS=0, deletes existing config file
|
||||
#
|
||||
#SAFE_SYMLINKS=1
|
||||
|
||||
|
||||
# lines which begin with '#' are ignored
|
||||
SYMLINKS="
|
||||
# fully qualified path ~/.config/THE-REST
|
||||
# ---------------------------------------------
|
||||
# /path/to/your/kitty.conf kitty/kitty.conf
|
||||
"
|
16
zsh/lib/system/desktop/notify.module.zsh
Normal file
16
zsh/lib/system/desktop/notify.module.zsh
Normal file
@ -0,0 +1,16 @@
|
||||
#####################################################################
|
||||
|
||||
DEPENDENCIES+=(
|
||||
notify-send
|
||||
)
|
||||
|
||||
REQUIRED_ENV+=()
|
||||
|
||||
#####################################################################
|
||||
|
||||
NOTIFY() {
|
||||
local D=$DISPLAY
|
||||
[ ! $D ] && D=:0
|
||||
|
||||
DISPLAY=$D notify-send "SCWRYPTS $SCWRYPT_NAME" $@
|
||||
}
|
78
zsh/lib/system/packages/git.module.zsh
Normal file
78
zsh/lib/system/packages/git.module.zsh
Normal file
@ -0,0 +1,78 @@
|
||||
#####################################################################
|
||||
|
||||
DEPENDENCIES+=(
|
||||
git
|
||||
make
|
||||
)
|
||||
|
||||
REQUIRED_ENV+=()
|
||||
|
||||
#####################################################################
|
||||
|
||||
PACKAGE_INSTALL_DIR="$HOME/.local/share/source-packages"
|
||||
[ ! -d "$PACKAGE_INSTALL_DIR" ] && mkdir -p "$PACKAGE_INSTALL_DIR"
|
||||
|
||||
#####################################################################
|
||||
|
||||
CLONE() {
|
||||
cd "$PACKAGE_INSTALL_DIR"
|
||||
STATUS "downloading $NAME"
|
||||
git clone "$TARGET" "$NAME" \
|
||||
&& SUCCESS "successfully downloaded '$NAME'" \
|
||||
|| FAIL 1 "failed to download '$NAME'" \
|
||||
;
|
||||
}
|
||||
|
||||
PULL() {
|
||||
STATUS "updating '$NAME'"
|
||||
cd "$PACKAGE_INSTALL_DIR/$NAME"
|
||||
git pull origin $(git rev-parse --abbrev-ref HEAD) \
|
||||
&& SUCCESS "successfully updated '$NAME'" \
|
||||
|| FAIL 1 "failed to update '$NAME'" \
|
||||
;
|
||||
}
|
||||
|
||||
#####################################################################
|
||||
|
||||
BUILD() {
|
||||
cd "$PACKAGE_INSTALL_DIR/$NAME"
|
||||
|
||||
CHECK_MAKE && { MAKE && return 0 || return 1; }
|
||||
CHECK_MAKEPKG && { MAKEPKG && return 0 || return 2; }
|
||||
|
||||
WARNING 'could not detect supported installation method'
|
||||
|
||||
REMINDER 'complete manual installation in the directory below:'
|
||||
REMINDER "$PACKAGE_INSTALL_DIR/$NAME"
|
||||
}
|
||||
|
||||
CHECK_MAKE() { [ -f ./Makefile ]; }
|
||||
CHECK_MAKEPKG() { [ -f ./PKGBUILD ]; }
|
||||
|
||||
MAKE() {
|
||||
[[ $CLEAN -eq 1 ]] && {
|
||||
STATUS "cleaning '$NAME'"
|
||||
make clean
|
||||
}
|
||||
|
||||
STATUS "building '$NAME'"
|
||||
make \
|
||||
&& SUCCESS "finished building '$NAME'" \
|
||||
|| FAIL 1 "build failed for '$NAME' (see above)"\
|
||||
;
|
||||
|
||||
STATUS "installing '$NAME'"
|
||||
GETSUDO
|
||||
sudo make install \
|
||||
&& SUCCESS "succesfully installed '$NAME'" \
|
||||
|| FAIL 2 "failed to install '$NAME' (see above)"\
|
||||
;
|
||||
}
|
||||
|
||||
MAKEPKG() {
|
||||
STATUS "installing '$NAME'"
|
||||
yes | makepkg -si \
|
||||
&& SUCCESS "succesfully installed '$NAME'" \
|
||||
|| FAIL 1 "failed to install '$NAME' (see above)"\
|
||||
;
|
||||
}
|
11
zsh/lib/system/vim/vim.module.zsh
Normal file
11
zsh/lib/system/vim/vim.module.zsh
Normal file
@ -0,0 +1,11 @@
|
||||
#####################################################################
|
||||
|
||||
DEPENDENCIES+=(
|
||||
vim
|
||||
)
|
||||
|
||||
REQUIRED_ENV+=()
|
||||
|
||||
#####################################################################
|
||||
|
||||
VIM() { vim $@ </dev/tty >/dev/tty; }
|
53
zsh/lib/system/vim/vundle.module.zsh
Normal file
53
zsh/lib/system/vim/vundle.module.zsh
Normal file
@ -0,0 +1,53 @@
|
||||
#####################################################################
|
||||
|
||||
DEPENDENCIES+=()
|
||||
REQUIRED_ENV+=()
|
||||
|
||||
use system/vim
|
||||
|
||||
#####################################################################
|
||||
|
||||
VUNDLE__PLUGIN_DIR="$HOME/.vim/bundle"
|
||||
VUNDLE__BUILD_DEFINITIONS="$SCWRYPTS_CONFIG_PATH/vundle.zsh"
|
||||
|
||||
[ ! -f $VUNDLE__BUILD_DEFINITIONS ] && {
|
||||
{
|
||||
echo -e "#\n# Scwrypts Build Definitions\n#\n"
|
||||
} > $VUNDLE__BUILD_DEFINITIONS
|
||||
}
|
||||
|
||||
VUNDLE__PLUGIN_LIST=$(ls $VUNDLE__PLUGIN_DIR | grep -v 'Vundle.vim' | grep -v 'build.zsh')
|
||||
source $VUNDLE__BUILD_DEFINITIONS
|
||||
for PLUGIN in $(echo $VUNDLE__PLUGIN_LIST)
|
||||
do
|
||||
typeset -f VUNDLE__BUILD__$PLUGIN >/dev/null 2>/dev/null || {
|
||||
echo -e "\nVUNDLE__BUILD__$PLUGIN() {\n # ... build steps from $HOME/.vim/$PLUGIN \n}" \
|
||||
>> $VUNDLE__BUILD_DEFINITIONS
|
||||
VUNDLE__BUILD__$PLUGIN() {}
|
||||
}
|
||||
done
|
||||
|
||||
#####################################################################
|
||||
|
||||
VUNDLE__PLUGIN_INSTALL() {
|
||||
VIM +PluginInstall +qall \
|
||||
&& SUCCESS 'successfully installed Vundle.vim plugins' \
|
||||
|| FAIL 1 'failed to install Vundle.vim plugins'
|
||||
}
|
||||
|
||||
VUNDLE__REBUILD_PLUGINS() {
|
||||
local ERRORS=0
|
||||
|
||||
local PLUGIN
|
||||
for PLUGIN in $(echo $VUNDLE__PLUGIN_LIST)
|
||||
do
|
||||
cd "$VUNDLE__PLUGIN_DIR/$PLUGIN"
|
||||
STATUS "building '$PLUGIN'"
|
||||
VUNDLE__BUILD__$PLUGIN \
|
||||
&& SUCCESS "finished building '$PLUGIN'" \
|
||||
|| ERROR "failed to build '$PLUGIN' (see above)" \
|
||||
;
|
||||
done
|
||||
|
||||
return $ERRORS
|
||||
}
|
Reference in New Issue
Block a user