Skip to content

Remove cifs_common, move functions into cifs_mount & cifs_umount #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davewongillies wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove cifs_common, move functions into cifs_mount & cifs_umount #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions cifs_common.sh
View file
Open in desktop

This file was deleted.

48 changes: 43 additions & 5 deletions cifs_mount.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,49 @@ BOOT_ARG="--boot-start"
USER_STARTUP="/media/fat/linux/user-startup.sh"
USER_STARTUP_TEMPLATE="/media/fat/linux/_user-startup.sh"

trim_ini_field() {
local FIELD="$1"
FIELD="${FIELD#"${FIELD%%[!$' \t']*}"}"
FIELD="${FIELD%"${FIELD##*[!$' \t']}"}"
printf '%s' "$FIELD"
}

load_cifs_ini() {
local INI_FILE="$1"
local LINE KEY VALUE ALLOWED_KEY KEY_ALLOWED
shift

while IFS= read -r LINE || [ "$LINE" != "" ]
do
LINE=${LINE%$'\r'}
case "$LINE" in
*=*) ;;
*) continue ;;
esac
KEY=$(trim_ini_field "${LINE%%=*}")
case "$KEY" in
''|\#*) continue ;;
esac

KEY_ALLOWED="false"
for ALLOWED_KEY in "$@"
do
if [ "$KEY" == "$ALLOWED_KEY" ]
then
KEY_ALLOWED="true"
break
fi
done
[ "$KEY_ALLOWED" == "true" ] || continue

VALUE=$(trim_ini_field "${LINE#*=}")
case "$VALUE" in
\"*) VALUE=${VALUE#\"}; VALUE=${VALUE%%\"*} ;;
\'*) VALUE=${VALUE#\'}; VALUE=${VALUE%%\'*} ;;
esac
printf -v "$KEY" '%s' "$VALUE"
done < "$INI_FILE"
}
resolve_path() {
if command -v realpath >/dev/null 2>&1
then
Expand All @@ -146,11 +189,6 @@ fi
SCRIPT_NAME=${ORIGINAL_SCRIPT_PATH##*/}
SCRIPT_NAME=${SCRIPT_NAME%.*}
SCRIPT_REALPATH=$(resolve_path "$ORIGINAL_SCRIPT_PATH")
case "$SCRIPT_REALPATH" in
*/*) SCRIPT_DIR=${SCRIPT_REALPATH%/*} ;;
*) SCRIPT_DIR="." ;;
esac
. "$SCRIPT_DIR/cifs_common.sh"
CIFS_MOUNT_INI_KEYS=(
SERVER
SHARE
Expand Down
43 changes: 42 additions & 1 deletion cifs_umount.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,49 @@ SINGLE_CIFS_CONNECTION="true"
SPECIAL_DIRECTORIES="config|linux|System Volume Information"
LAZY_UNMOUNT_ON_BUSY="true"

trim_ini_field() {
local FIELD="$1"
FIELD="${FIELD#"${FIELD%%[!$' \t']*}"}"
FIELD="${FIELD%"${FIELD##*[!$' \t']}"}"
printf '%s' "$FIELD"
}

load_cifs_ini() {
local INI_FILE="$1"
local LINE KEY VALUE ALLOWED_KEY KEY_ALLOWED
shift

while IFS= read -r LINE || [ "$LINE" != "" ]
do
LINE=${LINE%$'\r'}
case "$LINE" in
*=*) ;;
*) continue ;;
esac
KEY=$(trim_ini_field "${LINE%%=*}")
case "$KEY" in
''|\#*) continue ;;
esac

KEY_ALLOWED="false"
for ALLOWED_KEY in "$@"
do
if [ "$KEY" == "$ALLOWED_KEY" ]
then
KEY_ALLOWED="true"
break
fi
done
[ "$KEY_ALLOWED" == "true" ] || continue

VALUE=$(trim_ini_field "${LINE#*=}")
case "$VALUE" in
\"*) VALUE=${VALUE#\"}; VALUE=${VALUE%%\"*} ;;
\'*) VALUE=${VALUE#\'}; VALUE=${VALUE%%\'*} ;;
esac
printf -v "$KEY" '%s' "$VALUE"
done < "$INI_FILE"
}

resolve_path() {
if command -v realpath >/dev/null 2>&1
Expand All @@ -58,7 +100,6 @@ case "$SCRIPT_REALPATH" in
*/*) SCRIPT_DIR=${SCRIPT_REALPATH%/*} ;;
*) SCRIPT_DIR="." ;;
esac
. "$SCRIPT_DIR/cifs_common.sh"
CIFS_UMOUNT_INI_KEYS=(
BASE_PATH
LOCAL_DIR
Expand Down
78 changes: 0 additions & 78 deletions tests/cifs_ini_parser_test.sh
View file
Open in desktop

This file was deleted.