diff --git a/helium_helper.sh b/helium_helper.sh index 9301576..9632734 100755 --- a/helium_helper.sh +++ b/helium_helper.sh @@ -339,42 +339,42 @@ call_backup() { fi done fi - backup_logger + ${BACKUP_METHOD}_backup } backup_logger() { - mkdir -p $TMP/backup echo "### $APP_NAME_LONG CONFIG SNAPSHOT $(date) ###" >> $TMP/backup/conf_log echo >> $TMP/backup/conf_log + echo -e "\n - ${CRS}Creating ${CYN}config log${CRS}...${CRS}" shell_check - if [ "$ACTIVE_SHELL" == "zsh" ] ; then - if [ "$(cat $HOME/.zshrc | grep "$ALIAS")" ] ; then - echo " - Shell : $ACTIVE_SHELL" >> $TMP/backup/conf_log - echo " - Alias : TRUE" >> $TMP/backup/conf_log - fi - - elif [ "$ACTIVE_SHELL" == "bash" ] ; then - if [ "$(cat $HOME/.bashrc | grep "$ALIAS")" ] ; then - echo " - Shell : $ACTIVE_SHELL" >> $TMP/backup/conf_log - echo " - Alias : TRUE" >> $TMP/backup/conf_log - fi - - elif [ "$ACTIVE_SHELL" == "fish" ] ; then - if [ "$(cat $HOME/.config/fish/config.fish | grep "source $HOME/.config/fish/$ALIAS.fish")" ] ; then - echo " - Shell : $ACTIVE_SHELL" >> $TMP/backup/conf_log - echo " - Alias : TRUE" >> $TMP/backup/conf_log - fi - - else + if [ "$ACTIVE_SHELL" == "zsh" ] ; then + if [ "$(cat $HOME/.zshrc | grep "$ALIAS")" ] ; then echo " - Shell : $ACTIVE_SHELL" >> $TMP/backup/conf_log - echo " - Alias : FALSE" >> $TMP/backup/conf_log + echo " - Alias : TRUE" >> $TMP/backup/conf_log fi + + elif [ "$ACTIVE_SHELL" == "bash" ] ; then + if [ "$(cat $HOME/.bashrc | grep "$ALIAS")" ] ; then + echo " - Shell : $ACTIVE_SHELL" >> $TMP/backup/conf_log + echo " - Alias : TRUE" >> $TMP/backup/conf_log + fi + + elif [ "$ACTIVE_SHELL" == "fish" ] ; then + if [ "$(cat $HOME/.config/fish/config.fish | grep "source $HOME/.config/fish/$ALIAS.fish")" ] ; then + echo " - Shell : $ACTIVE_SHELL" >> $TMP/backup/conf_log + echo " - Alias : TRUE" >> $TMP/backup/conf_log + fi + + else + echo " - Shell : $ACTIVE_SHELL" >> $TMP/backup/conf_log + echo " - Alias : FALSE" >> $TMP/backup/conf_log + fi LOGGABLE=("$INSTALL_PATH/$APP_NAME.$FILE_EXTENSION" "$SCRIPT_PATH/$SCRIPT_FILE_NAME" "$SCRIPT_PATH/$AUTO_SCRIPT_FILE_NAME" "$LAUNCHER_PATH/$APP_NAME.desktop" "$APP_CONFIG_PATH") - for LOG_ITEM in ${LOGGABLE[@]} ; do + for LOG_ITEM in ${LOGGABLE[@]} ; do if [ -d "$LOG_ITEM" ] ; then echo " - Directory : $LOG_ITEM" >> $TMP/backup/conf_log @@ -391,12 +391,16 @@ backup_file_collector() { for BACKUP_ITEM in ${BACKUPABLE[@]} ; do if [ -d "$BACKUP_ITEM" ] ; then + mkdir -p $TMP/backup cp -r $BACKUP_ITEM $TMP/backup elif [ -f "$BACKUP_ITEM" ] ; then + mkdir -p $TMP/backup cp $BACKUP_ITEM $TMP/backup fi done + + backup_logger } script_backup() {