diff --git a/README.md b/README.md index aaf1b2b0..3fe78649 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,19 @@ docker run -e TERM -e COLORTERM -e LC_ALL=C.UTF-8 -w /root -it --rm alpine sh -u ```bash docker run -e TERM -e COLORTERM -w /root -it --rm ubuntu sh -uec ' apt-get update - apt-get install -y curl build-essential sudo + apt-get install -y curl build-essential sudo python3 g++ + su -c bash -c "$(curl -fsSL https://raw.githubusercontent.com/CodelyTV/dotly/HEAD/installer)" + su -c zsh' +``` + + + +
+Arch Linux: + +```bash +docker run -e TERM -e COLORTERM -w /root -it --rm archlinux sh -uec ' + pacman -Sy curl base-devel sudo python3 git su -c bash -c "$(curl -fsSL https://raw.githubusercontent.com/CodelyTV/dotly/HEAD/installer)" su -c zsh' ``` diff --git a/dotfiles_template/README.md b/dotfiles_template/README.md index b6a0d68d..ac3bb95b 100644 --- a/dotfiles_template/README.md +++ b/dotfiles_template/README.md @@ -27,3 +27,17 @@ bash <(curl -s https://raw.githubusercontent.com/CodelyTV/dotly/HEAD/restorer) You need to know your GitHub username, repository and install ssh key if your repository is private. It also supports other git repos, but you need to know your git repository url. + +## Restore your Dotfiles on Docker +
+Using Debian: + +```bash +docker run -e TERM -e COLORTERM -w /root -it --rm debian sh -uec ' + apt-get update + export USER="__GITHUB_USER__" + apt-get install -y curl build-essential sudo python3 git g++ + su -c bash -c "$(curl -fsSL https://raw.githubusercontent.com/CodelyTV/dotly/HEAD/restorer)" + su -c zsh' +``` +
diff --git a/installer b/installer index dc284abf..3d106074 100755 --- a/installer +++ b/installer @@ -67,9 +67,10 @@ _w "~ │ 🚀 Welcome to the ${green}dotly${normal} installer! │ ~" _w " └────────────────────────────────────┘" _w _q "Where do you want your dotfiles to be located? (default ~/.dotfiles)" "DOTFILES_PATH" -DOTFILES_PATH="${DOTFILES_PATH:-$HOME/.dotfiles}" -DOTFILES_PATH="$(eval echo "$DOTFILES_PATH")" +UNEXPANDED_DOTFILES_PATH="${DOTFILES_PATH:-\$HOME/.dotfiles}" +DOTFILES_PATH="$(eval echo "$UNEXPANDED_DOTFILES_PATH")" export DOTFILES_PATH="$DOTFILES_PATH" +export UNEXPANDED_DOTFILES_PATH="$UNEXPANDED_DOTFILES_PATH" dotly_inner_path="modules/dotly" export DOTLY_PATH="$DOTFILES_PATH/$dotly_inner_path" diff --git a/scripts/dotfiles/create b/scripts/dotfiles/create index 01010030..d139f071 100755 --- a/scripts/dotfiles/create +++ b/scripts/dotfiles/create @@ -12,9 +12,9 @@ source "$DOTLY_PATH/scripts/core/_main.sh" docs::parse "$@" dotfiles::apply_templating() { - sed -i -e "s|XXX_DOTFILES_PATH_XXX|$DOTFILES_PATH|g" "$DOTFILES_PATH/bin/sdot" - sed -i -e "s|XXX_DOTFILES_PATH_XXX|$DOTFILES_PATH|g" "$DOTFILES_PATH/shell/bash/.bashrc" - sed -i -e "s|XXX_DOTFILES_PATH_XXX|$DOTFILES_PATH|g" "$DOTFILES_PATH/shell/zsh/.zshenv" + sed -i -e "s|XXX_DOTFILES_PATH_XXX|$UNEXPANDED_DOTFILES_PATH|g" "$DOTFILES_PATH/bin/sdot" + sed -i -e "s|XXX_DOTFILES_PATH_XXX|$UNEXPANDED_DOTFILES_PATH|g" "$DOTFILES_PATH/shell/bash/.bashrc" + sed -i -e "s|XXX_DOTFILES_PATH_XXX|$UNEXPANDED_DOTFILES_PATH|g" "$DOTFILES_PATH/shell/zsh/.zshenv" } if [ ! -d "$DOTFILES_PATH/shell" ]; then