nemunaire/conf
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rework install process + add strong Firefox user.js

Browse source
This commit is contained in:
nemunaire 2015-06-29 17:39:56 +02:00
commit 1c44d6d0f5
2 changed files with 247 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

78
install.sh
View file

@ -20,7 +20,7 @@ cd $(dirname "$0")
if [ "$1" == "install" ] || [ "$1" == "link" ] || [ "$1" == "links" ]
then
REMOVE=1
BIN="ln -s"
BIN="ln -L -s"
elif [ "$1" == "update" ] || [ "$1" == "pull" ]
then
git stash &&
@ -34,7 +34,7 @@ then
elif [ "$1" == "copy" ]
then
REMOVE=1
BIN="cp -r"
BIN="cp -L -r"
else
echo -e "\e[32;01mNemunaire's configuration \e[0;33m("`git branch --no-color | grep '*' | cut -d " " -f 2-`")\e[0m"
echo -e " \e[01mAuthor:\e[0m\t\t"`git log -1 --format="%aN <%aE>"`
@ -61,10 +61,49 @@ IGNORE_FILES=".
install.sh"
TMPERR=`mktemp`
doins() {
echo -ne "Installing ${1##./} ...\t"
# Alignment
[ ${#1} -lt 11 ] && echo -en "\t"; [ ${#1} -lt 19 ] && echo -en "\t"
if [ -L "$2" ]
then
echo -e "\e[36mAlready installed\e[0m"
elif [ -d "$2" ] && [ -d "$1" ]
then
echo -e "\e[33mExistant directory\e[0m"
DESTDIR="${DESTDIR}/$1" install_dir "$1"
elif [ -e "$2" ]
then
echo -e "\e[35mAlready exists\e[0m"
else
if $BIN "$(pwd)/$1" "$2" >&2 2> "$TMPERR"
then
echo -e "\e[32mdone\e[0m"
else
echo -e "\e[31;01mfail\e[0m"
fi
cat "$TMPERR"
fi
}
install_dir() {
for f in `ls -a "$1"`
do
if ! in_list "$IGNORE_FILES" "$f"
if [ "$1/$f" == "./.mozilla" ]
then
if [ -d "${DESTDIR}/.mozilla/firefoxd" ]
then
find ${DESTDIR}/.mozilla/firefox -mindepth 1 -maxdepth 1 -type d |
while read dest
do
mozilla_case "$1/$f" "$dest"
done
else
echo -e "Installing .mozilla/firefox ...\t\t\e[34mSkipped\e[0m"
fi
elif ! in_list "$IGNORE_FILES" "$f"
then
if [ "$REMOVE" -eq 0 ]; then
echo -ne "Removing $1/$f ...\t"
@ -76,33 +115,18 @@ install_dir() {
echo -e "Not installed"
fi
else
echo -ne "Installing $1/$f ...\t"
# Alignment
[ $((${#f} + ${#1})) -lt 8 ] && echo -en "\t"; [ $((${#f} + ${#1})) -lt 16 ] && echo -en "\t"
if [ -L "${DESTDIR}/$1/$f" ]
then
echo -e "\e[36mAlready installed\e[0m"
elif [ -d "${DESTDIR}/$1/$f" ] && [ -d "$1/$f" ]
then
echo -e "\e[33mExistant directory\e[0m"
install_dir "$1/$f"
elif [ -e "${DESTDIR}/$1/$f" ]
then
echo -e "\e[35mAlready exists\e[0m"
else
if $BIN "$(pwd)/$1/$f" "${DESTDIR}/$1/$f" >&2 2> "$TMPERR"
then
echo -e "\e[32mdone\e[0m"
else
echo -e "\e[31;01mfail\e[0m"
fi
cat "$TMPERR"
fi
doins "$1/$f" "${DESTDIR}/$f"
fi
fi
done
}
mozilla_case() {
echo -e "Installing .mozilla/firefox/${2##*/} ...\t\e[33mExisting profile\e[0m"
DESTDIR="${2}" install_dir .mozilla/firefox
}
# Common installation
install_dir .
rm "${TMPERR}"