From 48545ddce43afde0171275522f2c0c253a52f8a9 Mon Sep 17 00:00:00 2001 From: crims0n Date: Sat, 16 Jan 2021 03:40:17 +0300 Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D1=83=D0=B6=D0=BD=D1=83=D1=8E=20=D1=84=D1=83=D0=BD?= =?UTF-8?q?=D0=BA=D1=86=D0=B8=D1=8E,=20=D0=BD=D0=B0=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B8=D0=BB=20=D0=B8=D0=B3=D0=BD=D0=BE=D1=80=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D0=BF=D0=BA?= =?UTF-8?q?=D0=B8=20.git=20=D0=BF=D1=80=D0=B8=20=D1=81=D0=B1=D0=BE=D1=80?= =?UTF-8?q?=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- linux-live/minioslib | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/linux-live/minioslib b/linux-live/minioslib index 30cf788..36ff169 100644 --- a/linux-live/minioslib +++ b/linux-live/minioslib @@ -383,7 +383,7 @@ function create_backup() { mkdir -p $PARENT_DIR/minios-live-current (cd $SCRIPT_DIR && cp --parents -afr * $PARENT_DIR/minios-live-current) else - for file in $(find $SCRIPT_DIR -type f | sed "s,$SCRIPT_DIR/,,g" | sed "s,.script_version,,g"); do + for file in $(find $SCRIPT_DIR -path $SCRIPT_DIR/.git -prune -false -o -type f | sed "s,$SCRIPT_DIR/,,g" | sed "s,.script_version,,g"); do if ! cmp $SCRIPT_DIR/$file $PARENT_DIR/minios-live-current/$file >>$OUTPUT 2>&1; then CHANGED="1" echo -e "$file has been modified since last backup." >>$OUTPUT 2>&1 @@ -410,21 +410,6 @@ function create_backup() { # ================================================================= # ================================================================= -function select_distribution() { - # unused - echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..." - case $DISTRIBUTION in - bionic) - $DEBOOTSTRAP_URL=http://ru.archive.ubuntu.com/ubuntu/ - $SOURCES_LIST=$SCRIPT_DIR/linux-live/sources/bionic.list - ;; - focal) - $DEBOOTSTRAP_URL=http://ru.archive.ubuntu.com/ubuntu/ - $SOURCES_LIST=$SCRIPT_DIR/linux-live/sources/focal.list - ;; - esac -} - function create_apt_list() { echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..." if [ ! -f $SCRIPT_DIR/linux-live/aptsources/$DISTRIBUTION.list ]; then @@ -836,4 +821,4 @@ function chroot_finish_up() { } if [ grep ]; then echo -fi \ No newline at end of file +fi