Compare commits

..

4 Commits

4 changed files with 34 additions and 22 deletions

16
install
View File

@ -53,6 +53,22 @@ if hash pre-commit 2> /dev/null; then
pre-commit gc
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
if hash updatedb 2> /dev/null; then
(updatedb &)
fi
fi
if [ -f "$MIKAELA_GREP" ]; then
bash -x .mikaela_install
fi

View File

@ -233,11 +233,11 @@ UNAME=$(uname)
CPUARCH=$(uname -p)
# If we are on Linux, enable apt progress bar and colours
if [[ $USER == "root" ]]; then
mkdir -p /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 [[ $USER == "root" ]]; then
# mkdir -p /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 gpg[-agent] has sshcontrol file, use it as ssh-agent. sshcontrol should
# include the authentication subkey keygrip from
@ -735,11 +735,11 @@ function shell-things {
# (Everything expects nodejs to be called as node, but it's not with Debian.)
fix-node() {
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
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
ln -s /usr/bin/nodejs $HOME/.local/bin/node
ln -fnsv /usr/bin/nodejs "$HOME/.local/bin/node"
fi
}

View File

@ -215,11 +215,11 @@ else
fi
# If we are on Linux, enable apt progress bar and colours
if [[ $USER = "root" ]]; then
mkdir -p /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 [[ $USER = "root" ]]; then
# mkdir -p /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
# OS X ls colours (copied from https://apple.stackexchange.com/questions/33677/
export CLICOLOR=1
@ -724,17 +724,13 @@ cd
# This function fixes nodejs on Debian based systems.
# (Everything expects nodejs to be called as node, but it's not with Debian.)
function fix-node {
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
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;
ln -s /usr/bin/nodejs $HOME/.local/bin/node
ln -fnsv /usr/bin/nodejs $HOME/.local/bin/node
fi
}
# This function removes and regenerates ssh host keys.