Browse Source

удалил ненужную функцию, настроил игнорирование папки .git при сборке

master
crims0n 5 years ago
parent
commit
48545ddce4
  1. 17
      linux-live/minioslib

17
linux-live/minioslib

@ -383,7 +383,7 @@ function create_backup() {
mkdir -p $PARENT_DIR/minios-live-current mkdir -p $PARENT_DIR/minios-live-current
(cd $SCRIPT_DIR && cp --parents -afr * $PARENT_DIR/minios-live-current) (cd $SCRIPT_DIR && cp --parents -afr * $PARENT_DIR/minios-live-current)
else 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 if ! cmp $SCRIPT_DIR/$file $PARENT_DIR/minios-live-current/$file >>$OUTPUT 2>&1; then
CHANGED="1" CHANGED="1"
echo -e "$file has been modified since last backup." >>$OUTPUT 2>&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() { function create_apt_list() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..." echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
if [ ! -f $SCRIPT_DIR/linux-live/aptsources/$DISTRIBUTION.list ]; then if [ ! -f $SCRIPT_DIR/linux-live/aptsources/$DISTRIBUTION.list ]; then

Loading…
Cancel
Save