Merge branch 'xdg-compliance' into 'master'

xdgUpdate: move config file to .config/AtOM/

Closes #2

See merge request atom/AtOM!10

atom

@@ -46,8 +46,6 @@ declare -r				\
 					\
 	oldIFS="$IFS"
 
-cffile="$HOME/.atom/atom.cfg"
-
 LC_ALL=C
 
 shopt -s extglob
@@ -59,6 +57,15 @@ do
 	source "$function"
 done
 
+if ! [[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/AtOM/atom.cfg" ]]	\
+&& [[ -f "$HOME/.atom/atom.cfg" ]]
+then
+	echo	"Configuration found in legacy location $HOME/.atom/atom.cfg."\
+		"Migrating configuration and data to XDG standard"
+	xdgMigrate
+fi
+cffile="${XDG_CONFIG_HOME:-$HOME/.config}/AtOM/atom.cfg"
+
 help() {
 	cat <<-EOF
 	Options:
@@ -78,7 +85,6 @@ help() {
 }
 
 #parse arguments
-OPTERR=0
 while getopts ':c:Cl:T:F:f:B:ShDq' opt
 do
 	case $opt in

lib/xdg/migrate

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+# https://specifications.freedesktop.org/basedir-spec/latest/
+
+xdgUpdateData() {
+	local -r programname=AtOM
+	local -r my_data_home="${XDG_DATA_HOME:-$HOME/.local/share}/$programname"
+	local -r new_db_path="$my_data_home/atom.db"
+
+	[[ -d "$my_data_home" ]] || mkdir -p "$my_data_home"
+	mv "$1" "$new_db_path"
+	echo "$new_db_path"
+}
+
+xdgUpdateRuntime() {
+	local -r programname=AtOM					\
+		my_runtime_dir="${XDG_RUNTIME_DIR:-/tmp}"		\
+
+	echo "$my_runtime_dir/$programname"
+}
+
+xdgMigrate() {
+	local -r programname=AtOM
+	local -r my_config_home="${XDG_CONFIG_HOME:-$HOME/.config}/$programname"
+	local new_database
+
+	cffile="$HOME/.atom/atom.cfg"
+	getConfig
+	new_database=$(xdgUpdateData "$database")
+	database="$new_database"
+	tempdir=$(xdgUpdateRuntime)
+	cffile="$my_config_home/atom.cfg"
+	[[ -d "$my_config_home" ]] || mkdir -p "$my_config_home"
+	writeConfig >"$cffile"
+}

toys/checkextensions

@@ -32,7 +32,6 @@ declare -r				\
 					\
 	oldIFS="$IFS"
 
-cffile="$HOME/.atom/atom.cfg"
 LC_ALL=C
 
 shopt -s extglob
@@ -42,6 +41,15 @@ do
 	source "$function"
 done
 
+if ! [[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/AtOM/atom.cfg" ]]	\
+&& [[ -f "$HOME/.atom/atom.cfg" ]]
+then
+	echo	"Configuration found in legacy location $HOME/.atom/atom.cfg."\
+		"Migrating configuration and data to XDG standard"
+	xdgMigrate
+fi
+cffile="${XDG_CONFIG_HOME:-$HOME/.config}/AtOM/atom.cfg"
+
 while getopts 'urnD' opt
 do
 	case $opt in

toys/checkgenre

@@ -32,7 +32,6 @@ declare -r				\
 					\
 	oldIFS="$IFS"
 
-cffile="$HOME/.atom/atom.cfg"
 LC_ALL=C
 
 shopt -s extglob
@@ -42,6 +41,15 @@ do
 	source "$function"
 done
 
+if ! [[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/AtOM/atom.cfg" ]]	\
+&& [[ -f "$HOME/.atom/atom.cfg" ]]
+then
+	echo	"Configuration found in legacy location $HOME/.atom/atom.cfg."\
+		"Migrating configuration and data to XDG standard"
+	xdgMigrate
+fi
+cffile="${XDG_CONFIG_HOME:-$HOME/.config}/AtOM/atom.cfg"
+
 while getopts 'D' opt
 do
 	case $opt in

toys/checkmissing

@@ -32,7 +32,6 @@ declare -r				\
 					\
 	oldIFS="$IFS"
 
-cffile="$HOME/.atom/atom.cfg"
 LC_ALL=C
 
 shopt -s extglob
@@ -42,6 +41,15 @@ do
 	source "$function"
 done
 
+if ! [[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/AtOM/atom.cfg" ]]	\
+&& [[ -f "$HOME/.atom/atom.cfg" ]]
+then
+	echo	"Configuration found in legacy location $HOME/.atom/atom.cfg."\
+		"Migrating configuration and data to XDG standard"
+	xdgMigrate
+fi
+cffile="${XDG_CONFIG_HOME:-$HOME/.config}/AtOM/atom.cfg"
+
 while getopts 'Dr' opt
 do
 	case $opt in

toys/cleandestinations

@@ -32,7 +32,6 @@ declare -r				\
 					\
 	oldIFS="$IFS"
 
-cffile="$HOME/.atom/atom.cfg"
 LC_ALL=C
 
 shopt -s extglob
@@ -42,6 +41,15 @@ do
 	source "$function"
 done
 
+if ! [[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/AtOM/atom.cfg" ]]	\
+&& [[ -f "$HOME/.atom/atom.cfg" ]]
+then
+	echo	"Configuration found in legacy location $HOME/.atom/atom.cfg."\
+		"Migrating configuration and data to XDG standard"
+	xdgMigrate
+fi
+cffile="${XDG_CONFIG_HOME:-$HOME/.config}/AtOM/atom.cfg"
+
 while getopts 'rD' opt
 do
 	case $opt in

toys/createindex

@@ -34,8 +34,6 @@ declare -r				\
 					\
 	oldIFS="$IFS"
 
-cffile="$HOME/.atom/atom.cfg"
-
 LC_ALL=C
 
 shopt -s extglob
@@ -47,6 +45,15 @@ do
 	source "$function"
 done
 
+if ! [[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/AtOM/atom.cfg" ]]	\
+&& [[ -f "$HOME/.atom/atom.cfg" ]]
+then
+	echo	"Configuration found in legacy location $HOME/.atom/atom.cfg."\
+		"Migrating configuration and data to XDG standard"
+	xdgMigrate
+fi
+cffile="${XDG_CONFIG_HOME:-$HOME/.config}/AtOM/atom.cfg"
+
 args="$@"
 while [ -n "$1" ]
 do

toys/lowquality

@@ -32,7 +32,6 @@ declare -r				\
 					\
 	oldIFS="$IFS"
 
-cffile="$HOME/.atom/atom.cfg"
 LC_ALL=C
 
 shopt -s extglob
@@ -42,6 +41,15 @@ do
 	source "$function"
 done
 
+if ! [[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/AtOM/atom.cfg" ]]	\
+&& [[ -f "$HOME/.atom/atom.cfg" ]]
+then
+	echo	"Configuration found in legacy location $HOME/.atom/atom.cfg."\
+		"Migrating configuration and data to XDG standard"
+	xdgMigrate
+fi
+cffile="${XDG_CONFIG_HOME:-$HOME/.config}/AtOM/atom.cfg"
+
 while getopts 'fm:o:p:*:uD' opt
 do
 	case $opt in

toys/missingtags

@@ -33,7 +33,6 @@ declare -r				\
 					\
 	oldIFS="$IFS"
 
-cffile="$HOME/.atom/atom.cfg"
 LC_ALL=C
 
 shopt -s extglob
@@ -43,6 +42,15 @@ do
 	source "$function"
 done
 
+if ! [[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/AtOM/atom.cfg" ]]	\
+&& [[ -f "$HOME/.atom/atom.cfg" ]]
+then
+	echo	"Configuration found in legacy location $HOME/.atom/atom.cfg."\
+		"Migrating configuration and data to XDG standard"
+	xdgMigrate
+fi
+cffile="${XDG_CONFIG_HOME:-$HOME/.config}/AtOM/atom.cfg"
+
 while getopts 'AlacdgptnNyuD' opt
 do
 	case $opt in