autoinstall/bashly.yml

@@ -1,6 +1,6 @@
 name: autoinstall
 help: Install files, repository and else
-version: 0.1.3
+version: 0.1.1
 
 flags:
   - long: --clean
@@ -30,12 +30,6 @@ commands:
       - name: group
         required: true
         help: The group to install
-    flags:
-      - long: --file
-        short: -f
-        help: File from which to read autoinstall-config
-        arg: file
-        default: $XDG_CONFIG_HOME/autoinstall.conf
 
   - name: git
     help: Install a git repository
@@ -115,13 +109,3 @@ commands:
       - name: target
         required: true
         help: The path to write the result to
-
-  - name: flatpak
-    help: Install a flatpak
-    args:
-      - name: flatpak
-        required: true
-        help: The flatpak to install
-      - name: mode
-        required: true
-        help: The target to install into (user or system)

autoinstall/before.sh

@@ -2,8 +2,8 @@
 
 action=${action:?}
 
-# do nothing on some selected actions
-if [ "$action" = "completions" ] || [ "$action" = "flatpak" ] || [ "$action" = "run" ]
+# if action is run or completions, do nothing
+if [ "$action" = "run" ] || [ "$action" = "completions" ]
 then
 	return
 fi
@@ -19,12 +19,5 @@ fi
 if [ -n "$clean" ] || [ -n "${AUTOINSTALL_CLEAN:-}" ]
 then
 	echo "Cleaning $target"
-
-	# sanity checks
-	if [ -z "$target" ] || [ "$target" = "/" ] || [ "$target" = "$HOME" ] || [ "$target" = "$HOME/" ]
-	then
-		echo "Invalid target: '$target'"
-		exit 1
-	fi
 	rm -rf "$target"
 fi

autoinstall/file_command.sh

@@ -5,7 +5,7 @@ completions=${args[--completions]:-}
 target=${args[target]:?}
 url=${args[url]:?}
 
-if [ "${action:-file}" = "exe" ] && ! echo "$target" | grep -q "/"
+if [ "${action:-file}" = "exe" ]
 then
 	if [ -x "$(command -v "$target")" ]
 	then
@@ -16,7 +16,7 @@ then
 fi
 
 
-if [ ! -e "$target" ]
+if [ ! -f "$target" ]
 then
 	echo "Installing file $url to $target"
 
@@ -33,11 +33,8 @@ then
 		if [ -n "$completions" ]
 		then
 			echo "Installing completions for $exe"
-
-			# path taken from "__load_completion" function
-			bash_completions_dir=${BASH_COMPLETION_USER_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/bash-completion}/completions
-			mkdir -p "$bash_completions_dir"
-			eval "$target $completions" > "$bash_completions_dir/_$(basename "$exe")"
+			# shellcheck disable=SC2086
+			"$target" $completions > "$XDG_CONFIG_HOME/completionsrc.d/_$(basename "$exe")"
 		fi
 	fi
 

autoinstall/flatpak_command.sh

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-flatpak=${args[flatpak]:?}
-mode=${args[mode]:?}
-
-if ! flatpak info "$flatpak" &> /dev/null
-then
-	echo "Installing flatpak $flatpak"
-
-	flatpak install -y "--$mode" "$flatpak"
-
-	_run_hook
-fi

autoinstall/run_command.sh

@@ -1,19 +1,25 @@
 #!/usr/bin/env bash
 
 group=${args[group]:?}
-file=${args[--file]:-}
 clean=${args[--clean]:-}
 
-_install_entry() {
-	type="$1"
-	source="$2"
-	target="$3"
-	hook="$4"
-	pipe="$5"
-	completions="$6"
+_config_query() {
+	tomlq -c --arg group "$group" \
+		'.autoinstall | map(select(.group == $group)) | '"$1" \
+		"$XDG_CONFIG_HOME/autoinstall.toml"
+}
 
+#length=$(_config_query "length")
+_config_query ".[]" | while read -r entry; do
 	install_args=()
 
+	type=$(echo "$entry" | jq -r '.type')
+	source=$(echo "$entry" | jq -r '.source')
+	target=$(echo "$entry" | jq -r '.target')
+	hook=$(echo "$entry" | jq -r '.hook // ""')
+	pipe=$(echo "$entry" | jq -r '.pipe // ""')
+	completions=$(echo "$entry" | jq -r '.completions // ""')
+
 	if [[ -n "$hook" ]]; then
 		install_args+=("--hook=$hook")
 	fi
@@ -32,57 +38,11 @@ _install_entry() {
 
 	if [[ $source = \$* ]]
 	then
-    source=$(eval "echo $source")
+		source=$(eval "echo $source")
 	fi
 	install_args+=("$source")
 
 	install_args+=("$(eval "echo $target")")
 
-	"$0" "${install_args[@]}"
-}
-
-_handle_entry() {
-	unset AUTOINSTALL_ITEM_TYPE \
-		AUTOINSTALL_ITEM_SOURCE \
-		AUTOINSTALL_ITEM_TARGET \
-		AUTOINSTALL_ITEM_HOOK \
-		AUTOINSTALL_ITEM_PIPE \
-		AUTOINSTALL_ITEM_COMPLETIONS
-
-	eval "$1"
-
-	# check if we have the required vars
-	if [[ -z "${AUTOINSTALL_ITEM_TYPE:-}" \
-		|| -z "${AUTOINSTALL_ITEM_SOURCE:-}" \
-		|| -z "${AUTOINSTALL_ITEM_TARGET:-}" ]]
-	then
-		return
-	fi
-
-	_install_entry "$AUTOINSTALL_ITEM_TYPE" "$AUTOINSTALL_ITEM_SOURCE" \
-		"$AUTOINSTALL_ITEM_TARGET" "${AUTOINSTALL_ITEM_HOOK:-}" "${AUTOINSTALL_ITEM_PIPE:-}" "${AUTOINSTALL_ITEM_COMPLETIONS:-}"
-
-}
-
-file_lines=$(wc -l < "$file")
-line=0
-while [[ $line -lt $file_lines ]]; do
-	entry=$(tail -n +$line "$file" | awk '/^$/{exit} {print} ')
-	entry_len=$(echo "$entry" | wc -l)
-	line=$((line + entry_len))
-
-	if [[ $entry_len -le 1 ]]; then
-		continue
-	fi
-
-	if [[ "$group" != "all" ]]
-	then
-		# check if group is in groups
-		if ! echo "$entry" | grep -qE "^AUTOINSTALL_ITEM_GROUPS=\"(.*,)?$group(,.*)?\"$"
-		then
-			continue
-		fi
-	fi
-
-	_handle_entry "$entry" || true # ignore errors
+	autoinstall "${install_args[@]}"
 done

autostart-manage/bashly.yml

@@ -1,6 +1,6 @@
 name: autostart-manage
 help: Manage autostart
-version: 0.1.3
+version: 0.1.1
 
 dependencies:
   tomlq: please install yq (https://github.com/kislyuk/yq)

autostart-manage/before.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-service_file="$HOME/.config/systemd/user/autostart@.service"
-if [ ! -f "$service_file" ]; then
-  _deploy_service_file "$service_file"
-fi
-
-target_file="$HOME/.config/systemd/user/autostart.target"
-if [ ! -f "$target_file" ]; then
-  _deploy_target_file "$target_file"
-fi

autostart-manage/lib/common.sh

@@ -41,24 +41,10 @@ _autostart_run_graphical () {
 _echo_table () {
 	for unit in "$@"
 	do
-		if _systemctl "$unit" is-enabled --quiet
-		then
-			_enabled=$(green "enabled")
-		else
-			_enabled=$(red "disabled")
-		fi
-
-		if _systemctl "$unit" is-active --quiet
-		then
-			_active=$(green "active")
-		else
-			_active=$(red "inactive")
-		fi
-
 		printf "%s\t%s\t%s\t%s\n" \
 			"$unit" \
-			"$_enabled" \
-			"$_active" \
+			"$(_systemctl "$unit" is-enabled)" \
+			"$(_systemctl "$unit" is-active)" \
 			"$(_get_autostart_cmd "$unit")"
 	done
 }

autostart-manage/lib/systemd_files.sh

@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-_deploy_service_file() {
-  cat <<EOF > "$1"
-[Unit]
-Description=Autostart several tools and services
-StartLimitIntervalSec=120
-StartLimitBurst=10
-
-[Service]
-KillMode=process
-ExecStart=/bin/sh -c ". \$HOME/.profile && autostart-manage exec '%i'"
-Restart=on-failure
-RestartSec=5s
-EOF
-}
-
-_deploy_target_file() {
-  cat <<EOF > "$1"
-[Unit]
-Description=Current graphical user session
-Documentation=man:systemd.special(7)
-RefuseManualStart=no
-StopWhenUnneeded=no
-EOF
-}

run.sh

@@ -6,6 +6,4 @@ target=$(cat .target)
 
 make generate
 
-printf "\nBuild complete. Running...\n==========================\n\n"
-
-time "./output/$target" "$@"
+"./output/$target" "$@"