Fixed bugs in the installer:
- Bytecompilation run twice
- Bash style string concat that doesn't work with sh.
- Default path was \$HOME instead of the users homedir ('' vs "").
This commit is contained in:
bas smit
parent
e1c8e9b834
commit
ccf74a1197
|
|
@ -2,15 +2,15 @@ install_prelude () {
|
|||
printf " Cloning the repository.\n$RESET"
|
||||
if [ x$PRELUDE_VERBOSE != x ]
|
||||
then
|
||||
/usr/bin/env git clone $PRELUDE_URL $PRELUDE_INSTALL_DIR
|
||||
/usr/bin/env git clone $PRELUDE_URL $PRELUDE_INSTALL_DIR
|
||||
else
|
||||
/usr/bin/env git clone $PRELUDE_URL $PRELUDE_INSTALL_DIR > /dev/null 2>&1
|
||||
/usr/bin/env git clone $PRELUDE_URL $PRELUDE_INSTALL_DIR > /dev/null 2>&1
|
||||
fi
|
||||
if ! [ $? -eq 0 ]
|
||||
then
|
||||
printf "$RED Unkown git error occured during installation, "
|
||||
printf "please check the source url: $PRELUDE_URL\n$RESET"
|
||||
exit 1
|
||||
printf "$RED Unkown git error occured during installation, "
|
||||
printf "please check the source url: $PRELUDE_URL\n$RESET"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ make_prelude_dirs () {
|
|||
mkdir $PRELUDE_INSTALL_DIR/themes $PRELUDE_INSTALL_DIR/snippets > /dev/null 2>&1
|
||||
if ! [ $? -eq 0 ]
|
||||
then
|
||||
printf "$RED failed to create directories.\n$RESET"
|
||||
printf "$RED failed to create directories.\n$RESET"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -84,46 +84,46 @@ usage() {
|
|||
while [ $# -gt 0 ]
|
||||
do
|
||||
case $1 in
|
||||
-d | --directory)
|
||||
PRELUDE_INSTALL_DIR=$2
|
||||
shift 2
|
||||
;;
|
||||
-c | --colors)
|
||||
colors
|
||||
shift 1
|
||||
;;
|
||||
-s | --source)
|
||||
PRELUDE_URL=$2
|
||||
shift 2
|
||||
;;
|
||||
-i | --into)
|
||||
PRELUDE_INTO='true'
|
||||
shift 1
|
||||
;;
|
||||
-n | --no-bytecompile)
|
||||
PRELUDE_SKIP_BC='true'
|
||||
shift 1
|
||||
;;
|
||||
-h | --help)
|
||||
usage
|
||||
exit 0
|
||||
;;
|
||||
-v | --verbose)
|
||||
echo "prelude verbose $PRELUDE_VERBOSE"
|
||||
PRELUDE_VERBOSE='true';
|
||||
shift 1
|
||||
;;
|
||||
*)
|
||||
printf "Unkown option: $1\n"
|
||||
shift 1
|
||||
;;
|
||||
-d | --directory)
|
||||
PRELUDE_INSTALL_DIR=$2
|
||||
shift 2
|
||||
;;
|
||||
-c | --colors)
|
||||
colors
|
||||
shift 1
|
||||
;;
|
||||
-s | --source)
|
||||
PRELUDE_URL=$2
|
||||
shift 2
|
||||
;;
|
||||
-i | --into)
|
||||
PRELUDE_INTO='true'
|
||||
shift 1
|
||||
;;
|
||||
-n | --no-bytecompile)
|
||||
PRELUDE_SKIP_BC='true'
|
||||
shift 1
|
||||
;;
|
||||
-h | --help)
|
||||
usage
|
||||
exit 0
|
||||
;;
|
||||
-v | --verbose)
|
||||
echo "prelude verbose $PRELUDE_VERBOSE"
|
||||
PRELUDE_VERBOSE='true';
|
||||
shift 1
|
||||
;;
|
||||
*)
|
||||
printf "Unkown option: $1\n"
|
||||
shift 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
VERBOSE_COLOR=$BBLUE
|
||||
|
||||
[ -z $PRELUDE_URL ] && PRELUDE_URL='https://github.com/bbatsov/prelude.git'
|
||||
[ -z $PRELUDE_INSTALL_DIR ] && PRELUDE_INSTALL_DIR='$HOME/.emacs.d'
|
||||
[ -z $PRELUDE_URL ] && PRELUDE_URL="https://github.com/bbatsov/prelude.git"
|
||||
[ -z $PRELUDE_INSTALL_DIR ] && PRELUDE_INSTALL_DIR="$HOME/.emacs.d"
|
||||
|
||||
if [ x$PRELUDE_VERBOSE != x ]
|
||||
then
|
||||
|
|
@ -133,11 +133,11 @@ then
|
|||
printf "SOURCE_URL = $PRELUDE_URL\n"
|
||||
if [ -n $PRELUDE_SKIP_BC ]
|
||||
then
|
||||
printf "Skipping bytecompilation.\n"
|
||||
printf "Skipping bytecompilation.\n"
|
||||
fi
|
||||
if [ -n $PRELUDE_INTO ]
|
||||
then
|
||||
printf "Replacing existing config (if one exists).\n"
|
||||
printf "Replacing existing config (if one exists).\n"
|
||||
fi
|
||||
printf "$RESET"
|
||||
fi
|
||||
|
|
@ -191,13 +191,13 @@ then
|
|||
# Overwrite existing?
|
||||
if [ -n $PRELUDE_INTO ]
|
||||
then
|
||||
# Install into existing config
|
||||
PRELUDE_INSTALL_DIR+='/prelude'
|
||||
install_prelude
|
||||
# Install into existing config
|
||||
PRELUDE_INSTALL_DIR=$PRELUDE_INSTALL_DIR"/prelude"
|
||||
install_prelude
|
||||
else
|
||||
# Replace existing config
|
||||
install_prelude
|
||||
make_prelude_dirs
|
||||
# Replace existing config
|
||||
install_prelude
|
||||
make_prelude_dirs
|
||||
fi
|
||||
elif [ -e $PRELUDE_INSTALL_DIR ]
|
||||
then
|
||||
|
|
@ -217,16 +217,15 @@ if [ -z $PRELUDE_SKIP_BC ];
|
|||
then
|
||||
if which emacs 2>&1 > /dev/null
|
||||
then
|
||||
printf " Bytecompiling Prelude.\n"
|
||||
if [ x$PRELUDE_VERBOSE != x ]
|
||||
then
|
||||
emacs -batch -f batch-byte-compile $PRELUDE_INSTALL_DIR/prelude/*.el
|
||||
emacs -batch -f batch-byte-compile "$PRELUDE_INSTALL_DIR/prelude/*.el"
|
||||
else
|
||||
emacs -batch -f batch-byte-compile $PRELUDE_INSTALL_DIR/prelude/*.el > /dev/null 2>&1
|
||||
fi
|
||||
printf " Bytecompiling Prelude.\n"
|
||||
if [ x$PRELUDE_VERBOSE != x ]
|
||||
then
|
||||
emacs -batch -f batch-byte-compile $PRELUDE_INSTALL_DIR/prelude/*.el
|
||||
else
|
||||
emacs -batch -f batch-byte-compile $PRELUDE_INSTALL_DIR/prelude/*.el > /dev/null 2>&1
|
||||
fi
|
||||
else
|
||||
printf "$YELLOW Emacs not found.$RESET Skipping bytecompilation.\n"
|
||||
printf "$YELLOW Emacs not found.$RESET Skipping bytecompilation.\n"
|
||||
fi
|
||||
else
|
||||
printf "Skipping bytecompilation.\n"
|
||||
|
|
|
|||
Loading…
Reference in a new issue