quick fix
This commit is contained in:
+3
-4
@@ -29,12 +29,10 @@ function no_more_skeleton {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function link_etc {
|
function link_etc {
|
||||||
echo 1
|
|
||||||
local filename="$1" subfolder="${2:-}"
|
local filename="$1" subfolder="${2:-}"
|
||||||
local link_name="$filename"
|
local link_name="$filename"
|
||||||
[[ -v LINK_NAME ]] && link_name="$LINK_NAME"
|
[[ -v LINK_NAME ]] && link_name="$LINK_NAME"
|
||||||
|
|
||||||
echo 2
|
|
||||||
local source="$MIAOU_BASH_DIR/etc"
|
local source="$MIAOU_BASH_DIR/etc"
|
||||||
local destination="/etc"
|
local destination="/etc"
|
||||||
[[ -n "$subfolder" ]] && source+="/${subfolder}" && destination+="/${subfolder}"
|
[[ -n "$subfolder" ]] && source+="/${subfolder}" && destination+="/${subfolder}"
|
||||||
@@ -51,7 +49,6 @@ function link_etc {
|
|||||||
ln -s "$source/$filename" "$destination/$link_name"
|
ln -s "$source/$filename" "$destination/$link_name"
|
||||||
echo "link $source/$link_name created"
|
echo "link $source/$link_name created"
|
||||||
fi
|
fi
|
||||||
echo 3
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function link_config_files {
|
function link_config_files {
|
||||||
@@ -72,10 +69,12 @@ function link_config_files {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function in_azerty_zone {
|
function in_azerty_zone {
|
||||||
|
[[ -L /etc/localtime ]] || return 1
|
||||||
|
|
||||||
local zone
|
local zone
|
||||||
zone=$(readlink /etc/localtime)
|
zone=$(readlink /etc/localtime)
|
||||||
zone="${zone#/usr/share/zoneinfo/}" # remove prefix
|
zone="${zone#/usr/share/zoneinfo/}" # remove prefix
|
||||||
for i in "${AZERTY_ZONES[@]}"; do [[ "$zone" == "$i" ]] && return 0; done
|
for i in "${AZERTY_ZONES[@]}"; do [[ "$zone" == "$i" ]] && return; done
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -29,12 +29,9 @@ if [[ "$current" == "$latest" ]]; then
|
|||||||
else
|
else
|
||||||
# TODO: prevent refresh from development purpose
|
# TODO: prevent refresh from development purpose
|
||||||
rm -rf "$MIAOU_BASH_DIR"
|
rm -rf "$MIAOU_BASH_DIR"
|
||||||
echo BEFORE bootstrap
|
|
||||||
bootstrap
|
bootstrap
|
||||||
|
|
||||||
echo BEFORE init
|
|
||||||
miaou-bash "$MIAOU_BASH_DIR/lib/init.bash"
|
miaou-bash "$MIAOU_BASH_DIR/lib/init.bash"
|
||||||
echo AFTER INIT
|
|
||||||
echo "miaou-bash successfully updated"
|
echo "miaou-bash successfully updated"
|
||||||
miaou-bash --version
|
miaou-bash --version
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user