Update deprecated functions and glob patterns

Double quote strings to avoid glob splits
convert  to