mirror of
https://github.com/Matir/skel.git
synced 2026-05-25 21:19:09 -07:00
Update install.sh
This commit is contained in:
42
install.sh
42
install.sh
@@ -25,13 +25,6 @@ case $(uname) in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
is_comment() {
|
|
||||||
case "${1}" in
|
|
||||||
\#*) return 0 ;;
|
|
||||||
*) return 1 ;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
have_command() {
|
have_command() {
|
||||||
command -v "${1}" >/dev/null 2>&1
|
command -v "${1}" >/dev/null 2>&1
|
||||||
}
|
}
|
||||||
@@ -100,44 +93,12 @@ install_basic_dir() {
|
|||||||
local file
|
local file
|
||||||
find "${SRCDIR}" ${FINDTYPE} f -print | \
|
find "${SRCDIR}" ${FINDTYPE} f -print | \
|
||||||
while read -r file ; do
|
while read -r file ; do
|
||||||
local TARGET="${2}/${file#"${SRCDIR}"/}"
|
local TARGET="${DESTDIR}/${file#"${SRCDIR}"/}"
|
||||||
mkdir -p "$(dirname "${TARGET}")"
|
mkdir -p "$(dirname "${TARGET}")"
|
||||||
ln -s -f "${file}" "${TARGET}"
|
ln -s -f "${file}" "${TARGET}"
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
install_git() {
|
|
||||||
# Install or update a git repository
|
|
||||||
if ! have_command git ; then
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
local REPO="${*: -2:1}"
|
|
||||||
local DESTDIR="${*: -1:1}"
|
|
||||||
set -- "${@:1:$(($#-2))}"
|
|
||||||
if [ -d "${DESTDIR}/.git" ] ; then
|
|
||||||
( cd "${DESTDIR}" ; git pull -q )
|
|
||||||
else
|
|
||||||
if [ "${MINIMAL}" -eq 1 ] ; then
|
|
||||||
git clone --depth 1 "$@" "${REPO}" "${DESTDIR}"
|
|
||||||
else
|
|
||||||
git clone "$@" "${REPO}" "${DESTDIR}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
add_bin_symlink() {
|
|
||||||
local LINKNAME="${HOME}/bin/${2:-$(basename "$1")}"
|
|
||||||
if [ -e "${LINKNAME}" ] && ! [ -h "${LINKNAME}" ] ; then
|
|
||||||
echo "Refusing to overwrite ${LINKNAME}" >&2
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
ln -sf "${1}" "${LINKNAME}"
|
|
||||||
}
|
|
||||||
|
|
||||||
postinstall() {
|
|
||||||
true
|
|
||||||
}
|
|
||||||
|
|
||||||
ssh_key_already_installed() {
|
ssh_key_already_installed() {
|
||||||
# Return 1 if the key isn't already installed, 0 if it is
|
# Return 1 if the key isn't already installed, 0 if it is
|
||||||
local AK="${HOME}/.ssh/authorized_keys"
|
local AK="${HOME}/.ssh/authorized_keys"
|
||||||
@@ -318,7 +279,6 @@ install_main() {
|
|||||||
}
|
}
|
||||||
install_dotfiles
|
install_dotfiles
|
||||||
install_basic_dir "${BASEDIR}/bin" "${HOME}/bin"
|
install_basic_dir "${BASEDIR}/bin" "${HOME}/bin"
|
||||||
test "$MINIMAL" = 1 || postinstall
|
|
||||||
test "$INSTALL_KEYS" = 1 && install_keys
|
test "$INSTALL_KEYS" = 1 && install_keys
|
||||||
save_prefs
|
save_prefs
|
||||||
setup_git_email
|
setup_git_email
|
||||||
|
|||||||
Reference in New Issue
Block a user