Mikaela
/
shell-things
mirror of https://gitea.blesmrt.net/mikaela/shell-things.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

{bash,zsh}rc: throw apt and corepack to install, improve the fix-node function

This commit is contained in:
Aminda Suomalainen 2024-06-26 17:55:57 +03:00
parent 9e485419a4
commit f04733b799
Signed by: Mikaela
SSH Key Fingerprint: SHA256:CXLULpqNBdUKB6E6fLA1b/4SzG0HvKD19PbIePU175Q
3 changed files with 56 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
install
View File

@ -53,6 +53,19 @@ if hash pre-commit 2> /dev/null; then
pre-commit gc pre-commit gc
fi fi
if hash corepack 2> /dev/null; then
corepack enable --install-directory ~/.local/bin/
corepack enable npm --install-directory ~/.local/bin/
else
echo "WARNING! corepack is not installed."
fi
if [ "$(id -u)" == "0" ]; then
mkdir -vp /etc/apt/apt.conf.d/
echo 'Dpkg::Progress-Fancy "1";' > /etc/apt/apt.conf.d/99progressbar
echo 'APT::Color "1";' > /etc/apt/apt.conf.d/99color
fi
if [ -f "$MIKAELA_GREP" ]; then if [ -f "$MIKAELA_GREP" ]; then
bash -x .mikaela_install bash -x .mikaela_install
fi fi

42
rc/bashrc
View File

@ -233,11 +233,11 @@ UNAME=$(uname)
CPUARCH=$(uname -p) CPUARCH=$(uname -p)
# If we are on Linux, enable apt progress bar and colours # If we are on Linux, enable apt progress bar and colours
if [[ $USER == "root" ]]; then #if [[ $USER == "root" ]]; then
mkdir -p /etc/apt/apt.conf.d/ # mkdir -p /etc/apt/apt.conf.d/
echo 'Dpkg::Progress-Fancy "1";' > /etc/apt/apt.conf.d/99progressbar # echo 'Dpkg::Progress-Fancy "1";' > /etc/apt/apt.conf.d/99progressbar
echo 'APT::Color "1";' > /etc/apt/apt.conf.d/99color # echo 'APT::Color "1";' > /etc/apt/apt.conf.d/99color
fi #fi
# if gpg[-agent] has sshcontrol file, use it as ssh-agent. sshcontrol should # if gpg[-agent] has sshcontrol file, use it as ssh-agent. sshcontrol should
# include the authentication subkey keygrip from # include the authentication subkey keygrip from
@ -578,19 +578,19 @@ alias chattr="\chattr -V"
alias chmod="\chmod --verbose" alias chmod="\chmod --verbose"
# https://github.com/nodejs/corepack/blob/v0.28.2/README.md#corepack-enable--name # https://github.com/nodejs/corepack/blob/v0.28.2/README.md#corepack-enable--name
if hash corepack 2> /dev/null; then #if hash corepack 2> /dev/null; then
alias yarn="corepack yarn" # alias yarn="corepack yarn"
alias yarnpkg="corepack yarnpkg" # alias yarnpkg="corepack yarnpkg"
alias pnpm="corepack pnpm" # alias pnpm="corepack pnpm"
alias pnpx="corepack pnpx" # alias pnpx="corepack pnpx"
alias npm="corepack npm" # alias npm="corepack npm"
alias npx="corepack npx" # alias npx="corepack npx"
if ! hash prettier 2> /dev/null; then # if ! hash prettier 2> /dev/null; then
alias prettier="pnpm exec prettier --cache --ignore-unknown" # alias prettier="pnpm exec prettier --cache --ignore-unknown"
fi # fi
else #else
echo "WARNING! corepack is not installed." # echo "WARNING! corepack is not installed."
fi #fi
# https://pnpm.io/installation#using-a-shorter-alias # https://pnpm.io/installation#using-a-shorter-alias
alias pn="corepack pnpm" alias pn="corepack pnpm"
@ -735,11 +735,11 @@ function shell-things {
# (Everything expects nodejs to be called as node, but it's not with Debian.) # (Everything expects nodejs to be called as node, but it's not with Debian.)
fix-node() { fix-node() {
if [[ $USER == "root" && -f /usr/bin/nodejs && ! -f /usr/bin/node && ! -f /usr/local/bin/node ]]; then if [[ $USER == "root" && -f /usr/bin/nodejs && ! -f /usr/bin/node && ! -f /usr/local/bin/node ]]; then
ln -s /usr/bin/nodejs /usr/local/bin/node ln -fnsv /usr/bin/nodejs /usr/local/bin/node
fi fi
mkdir -p $HOME/.local/bin mkdir -vp "$HOME/.local/bin"
if [[ -f /usr/bin/nodejs && ! -f /usr/bin/node && ! -f /usr/local/bin/node && ! -f $HOME/.local/bin/node ]]; then if [[ -f /usr/bin/nodejs && ! -f /usr/bin/node && ! -f /usr/local/bin/node && ! -f $HOME/.local/bin/node ]]; then
ln -s /usr/bin/nodejs $HOME/.local/bin/node ln -fnsv /usr/bin/nodejs "$HOME/.local/bin/node"
fi fi
} }

48
rc/zshrc
View File

@ -215,11 +215,11 @@ else
fi fi
# If we are on Linux, enable apt progress bar and colours # If we are on Linux, enable apt progress bar and colours
if [[ $USER = "root" ]]; then #if [[ $USER = "root" ]]; then
mkdir -p /etc/apt/apt.conf.d/ # mkdir -p /etc/apt/apt.conf.d/
echo 'Dpkg::Progress-Fancy "1";' > /etc/apt/apt.conf.d/99progressbar # echo 'Dpkg::Progress-Fancy "1";' > /etc/apt/apt.conf.d/99progressbar
echo 'APT::Color "1";' > /etc/apt/apt.conf.d/99color # echo 'APT::Color "1";' > /etc/apt/apt.conf.d/99color
fi #fi
# OS X ls colours (copied from https://apple.stackexchange.com/questions/33677/ # OS X ls colours (copied from https://apple.stackexchange.com/questions/33677/
export CLICOLOR=1 export CLICOLOR=1
@ -568,22 +568,22 @@ alias chattr="\chattr -V"
alias chmod="\chmod --verbose" alias chmod="\chmod --verbose"
# https://github.com/nodejs/corepack/blob/v0.28.2/README.md#corepack-enable--name # https://github.com/nodejs/corepack/blob/v0.28.2/README.md#corepack-enable--name
if hash corepack 2>/dev/null; then #if hash corepack 2>/dev/null; then
alias yarn="corepack yarn" # alias yarn="corepack yarn"
alias yarnpkg="corepack yarnpkg" # alias yarnpkg="corepack yarnpkg"
alias pnpm="corepack pnpm" # alias pnpm="corepack pnpm"
alias pnpx="corepack pnpx" # alias pnpx="corepack pnpx"
alias npm="corepack npm" # alias npm="corepack npm"
alias npx="corepack npx" # alias npx="corepack npx"
if ! hash prettier 2>/dev/null; then # if ! hash prettier 2>/dev/null; then
alias prettier="pnpm exec prettier --cache --ignore-unknown" # alias prettier="pnpm exec prettier --cache --ignore-unknown"
fi # fi
else #else
echo "WARNING! corepack is not installed." # echo "WARNING! corepack is not installed."
fi #fi
# https://pnpm.io/installation#using-a-shorter-alias # https://pnpm.io/installation#using-a-shorter-alias
alias pn="corepack pnpm" alias pn="corepack pnpm"
# github-pages etc. # github-pages etc.
if hash bundle 2>/dev/null; then if hash bundle 2>/dev/null; then
@ -724,17 +724,13 @@ cd
# This function fixes nodejs on Debian based systems. # This function fixes nodejs on Debian based systems.
# (Everything expects nodejs to be called as node, but it's not with Debian.) # (Everything expects nodejs to be called as node, but it's not with Debian.)
function fix-node { function fix-node {
if [[ $USER = "root" && -f /usr/bin/nodejs && ! -f /usr/bin/node && ! -f /usr/local/bin/node ]] then; if [[ $USER = "root" && -f /usr/bin/nodejs && ! -f /usr/bin/node && ! -f /usr/local/bin/node ]] then;
ln -s /usr/bin/nodejs /usr/local/bin/node ln -fnsv /usr/bin/nodejs /usr/local/bin/node
fi fi
mkdir -p $HOME/.local/bin mkdir -p $HOME/.local/bin
if [[ -f /usr/bin/nodejs && ! -f /usr/bin/node && ! -f /usr/local/bin/node && ! -f $HOME/.local/bin/node ]] then; if [[ -f /usr/bin/nodejs && ! -f /usr/bin/node && ! -f /usr/local/bin/node && ! -f $HOME/.local/bin/node ]] then;
ln -s /usr/bin/nodejs $HOME/.local/bin/node ln -fnsv /usr/bin/nodejs $HOME/.local/bin/node
fi fi
} }
# This function removes and regenerates ssh host keys. # This function removes and regenerates ssh host keys.