From 39291c0a8cf1e220bd0fc97ca8cf652e6800b889 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Sun, 26 Dec 2021 20:30:29 -0300 Subject: [PATCH] Move 'other' folder and update scripts --- .../etc/X11/xorg.conf.d/00-keyboard.conf | 0 .../other}/etc/X11/xorg.conf.d/01-mouse.conf | 0 .../etc/X11/xorg.conf.d/10-monitor.conf | 0 .../other}/etc/X11/xorg.conf.d/12-module.conf | 0 .../other}/etc/X11/xorg.conf.d/15-server.conf | 0 .../other}/etc/X11/xorg.conf.d/5-device.conf | 0 scripts/bootstrap.sh | 5 +- scripts/install.sh | 11 +++-- scripts/linkFiles.sh | 47 ++++++++++++++----- 9 files changed, 45 insertions(+), 18 deletions(-) rename {other => dotfiles/other}/etc/X11/xorg.conf.d/00-keyboard.conf (100%) rename {other => dotfiles/other}/etc/X11/xorg.conf.d/01-mouse.conf (100%) rename {other => dotfiles/other}/etc/X11/xorg.conf.d/10-monitor.conf (100%) rename {other => dotfiles/other}/etc/X11/xorg.conf.d/12-module.conf (100%) rename {other => dotfiles/other}/etc/X11/xorg.conf.d/15-server.conf (100%) rename {other => dotfiles/other}/etc/X11/xorg.conf.d/5-device.conf (100%) diff --git a/other/etc/X11/xorg.conf.d/00-keyboard.conf b/dotfiles/other/etc/X11/xorg.conf.d/00-keyboard.conf similarity index 100% rename from other/etc/X11/xorg.conf.d/00-keyboard.conf rename to dotfiles/other/etc/X11/xorg.conf.d/00-keyboard.conf diff --git a/other/etc/X11/xorg.conf.d/01-mouse.conf b/dotfiles/other/etc/X11/xorg.conf.d/01-mouse.conf similarity index 100% rename from other/etc/X11/xorg.conf.d/01-mouse.conf rename to dotfiles/other/etc/X11/xorg.conf.d/01-mouse.conf diff --git a/other/etc/X11/xorg.conf.d/10-monitor.conf b/dotfiles/other/etc/X11/xorg.conf.d/10-monitor.conf similarity index 100% rename from other/etc/X11/xorg.conf.d/10-monitor.conf rename to dotfiles/other/etc/X11/xorg.conf.d/10-monitor.conf diff --git a/other/etc/X11/xorg.conf.d/12-module.conf b/dotfiles/other/etc/X11/xorg.conf.d/12-module.conf similarity index 100% rename from other/etc/X11/xorg.conf.d/12-module.conf rename to dotfiles/other/etc/X11/xorg.conf.d/12-module.conf diff --git a/other/etc/X11/xorg.conf.d/15-server.conf b/dotfiles/other/etc/X11/xorg.conf.d/15-server.conf similarity index 100% rename from other/etc/X11/xorg.conf.d/15-server.conf rename to dotfiles/other/etc/X11/xorg.conf.d/15-server.conf diff --git a/other/etc/X11/xorg.conf.d/5-device.conf b/dotfiles/other/etc/X11/xorg.conf.d/5-device.conf similarity index 100% rename from other/etc/X11/xorg.conf.d/5-device.conf rename to dotfiles/other/etc/X11/xorg.conf.d/5-device.conf diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index acadf75..6d1dd8d 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -107,10 +107,9 @@ checkForDependencies() { } startRice() { - displayDialogBox --title "CocoRice" --msgbox "Hi! This script will auto install my dotfiles." getGitconfigData - # sh scripts/linkFiles.sh + sh scripts/linkFiles.sh sh scripts/install.sh displayDialogBox --title "CocoRice" --msgbox "All done! Enjoy..." } @@ -126,7 +125,7 @@ runScript() { startRice - # clear + clear cd $lastFolder } diff --git a/scripts/install.sh b/scripts/install.sh index 0092f0d..9096692 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,15 +1,13 @@ #!/bin/sh cloneAndMake() { - # git clone --progress $2 2>&1 | dialog --progressbox "Downloading ${1}" 0 0 - whiptail "Downloading ${1}" 0 0 + displayDialogBox "Downloading ${1}" 0 0 git clone $2 2>&1 cd $1; sudo make install; cd .. } downloadAndInstallPackages() { DOTFILES_CONFIG=$HOME/.config - cd $DOTFILES_CONFIG if [[ ! -d "dwmblocks" ]]; then @@ -29,4 +27,9 @@ downloadAndInstallPackages() { fi } -downloadAndInstallPackages +runScript() { + source scripts/common.sh + downloadAndInstallPackages +} + +runScript diff --git a/scripts/linkFiles.sh b/scripts/linkFiles.sh index 7204b14..e2bad8e 100755 --- a/scripts/linkFiles.sh +++ b/scripts/linkFiles.sh @@ -14,7 +14,7 @@ linkFile() { mv "$2" "${2}.backup" ln -s "$1" "$2" else - selectedOption=$(dialog --menu "File already exists: $(basename "$1"), what would you like to do?" 10 60 0 1 "Skip" 2 "Skip all" 3 "Overwrite" 4 "Overwrite all" 5 "Backup" 6 "Backup all" 3>&1 1>&2 2>&3 3>&1) + selectedOption=$(displayDialogBox --menu "File already exists: $(basename "$1"), what would you like to do?" 10 60 0 1 "Skip" 2 "Skip all" 3 "Overwrite" 4 "Overwrite all" 5 "Backup" 6 "Backup all" 3>&1 1>&2 2>&3 3>&1) if [ $? -eq 1 ]; then exit 0 fi @@ -44,16 +44,14 @@ linkFile() { } loopThroughFiles() { - DOTFILES=$(pwd -P) - cd $DOTFILES + COCORICE=$(pwd -P) + DOTFILES=$COCORICE/dotfiles + DOTFILES_CONFIG="$DOTFILES/.config" + DOTFILES_LOCAL="$DOTFILES/.local" + DOTFILES_ICONS="$DOTFILES/.icons" + DOTFILES_SSH="$DOTFILES/.ssh" - DOTFILES_HOME=$DOTFILES/dotfiles - DOTFILES_CONFIG="$DOTFILES_HOME/.config" - DOTFILES_LOCAL="$DOTFILES_HOME/.local" - DOTFILES_ICONS="$DOTFILES_HOME/.icons" - DOTFILES_SSH="$DOTFILES_HOME/.ssh" - - for srcFile in $(find -H "$DOTFILES_HOME" -not -path '*.git' -not -path '*.config*' -not -path '*.ssh*' -not -path '*.icons*' -not -path '*.local*'); do + for srcFile in $(find -H "$DOTFILES" -not -path '*.git' -not -path '*.config*' -not -path '*.ssh*' -not -path '*.icons*' -not -path '*.local*'); do if [ "$(basename "${srcFile}")" = "CocoRice" ] || [ "$(basename "${srcFile}")" = "dotfiles" ]; then continue fi @@ -79,6 +77,33 @@ loopThroughFiles() { fi done done + + DOTFILES_OTHER=$DOTFILES/other + + if [ -d "$DOTFILES_OTHER" ]; then + filesOutput=$(find -H "$DOTFILES_OTHER" | sed -n 2~1p | awk '{ sub(/.*CocoRice\/dotfiles\/other\//, ""); print }') + displayDialogBox --yesno "There are 'other' files, would you like to install them?\n\n$filesOutput" + fi + + for srcFile in $(find -H "$DOTFILES_OTHER"); do + if [[ -d "$srcFile" ]]; then + var=$(echo "$srcFile" | awk '{ sub(/.*CocoRice\/dotfiles\/other\//, ""); print }') + + if [[ ! -d "$HOME/$var" ]]; then + sudo mkdir -p "$var" + fi + fi + + if [[ -f "$srcFile" ]]; then + var=$(echo "$srcFile" | awk '{ sub(/.*CocoRice\/dotfiles\/other\//, ""); print }') + sudo linkFile "$srcFile" "$var" + fi + done } -loopThroughFiles +runScript() { + source scripts/common.sh + loopThroughFiles +} + +runScript