diff --git a/.gitignore b/.gitignore
index afdcad4b..d39b89dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,6 @@ stamp-h1
swupd
swupd-client*tar.gz
swupd_*
-swupd.bash
tap-driver.sh
test-driver
test-suite.log
diff --git a/Makefile.am b/Makefile.am
index 8d5c7bd4..c5ebf7ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -277,6 +277,3 @@ man: $(dist_man_MANS)
rst2man.py "$<" > "$@.tmp" && mv -f "$@.tmp" "$@"
test/functional/completion/basic/test.bats: swupd.bash
-
-swupd.bash: $(top_srcdir)/scripts/swupd-completion.sh $(top_srcdir)/swupd
- bash $<
diff --git a/scripts/swupd-completion.sh b/scripts/swupd-completion.sh
deleted file mode 100755
index 1face2bd..00000000
--- a/scripts/swupd-completion.sh
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/bin/bash
-#
-# Software Updater - autocompletion script
-#
-# Copyright © 2016 Intel Corporation.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 2 or later of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-#
-# This program creates a _swupd function to be used by completion built-in
-# bash command to complete swup.
-# It reads options and subcommands from swup --help and then it reads
-# options for each subcommand recursively.
-
-
-SCRIPTNAME="swupd.bash"
-COMPLETIONFUNCTION="_swupd"
-SWUPDCOMMAND="./swupd"
-
-optionsfromhelp=""
-subcommandsfromhelp=()
-
-#Checks if swupd commad exists in current shell
-if [ ! -e $SWUPDCOMMAND ] ; then
- echo "Error: No swupd found"
- exit 1
-fi
-
-currenttype=""
-nexttype=""
-#reads "swupd --help" line by line
-while read word1 word2 rest
-do
- #For each line checks in what section is
- if [[ "$word1 $word2" == "Help Options:" ]]; then
- currenttype="options"
- continue
- fi
- if [[ "$word1" == "Subcommands:" ]]; then
- currenttype="subcommand"
- continue
- fi
- if [[ "$word1" == "" ]]; then
- currenttype=""
- continue
- fi
- case $currenttype in
- #In case of subcommand it inserts first word of line in an array
- ("subcommand")
- subcommandsfromhelp+=("$word1") ;;
- #For options it reads short and long options, remove the commma from short
- ("options")
- optionsfromhelp="${optionsfromhelp} ${word1%,} ${word2}" ;;
- #For the rest do nothing
- ("") : ;;
- esac
-done < <($SWUPDCOMMAND --help 2>&1)
-
-# Construct sed script
-#Convert all tabs to spaces
-SEDSCRIPT=$'s/\t/ /g'
-#get rid of anything that does not start with a -
-SEDSCRIPT+=';/^ *-/!d'
-#remove leading spaces
-SEDSCRIPT+=';s/^ *//'
-# remove commas, any extra spaces between options
-SEDSCRIPT+=';s/, *-/ -/'
-# Strip trailing junk, anything after = or the second word
-SEDSCRIPT+=';s/=.*//'
-SEDSCRIPT+=';s/^\([^ ]* [^ ]*\).*/\1/'
-# See if there is only one option on line
-SEDSCRIPT+=';/ -/!s/ .*//'
-
-#Autocomplete script creation
-{
-cat <.
-#
-
-
-#declares the completion function
-${COMPLETIONFUNCTION}()
-{
- # \$1 is the command being completed, \$2 is the current word being expanded
- local opts IFS=\$' \t\n'
- local -i i installed
- COMPREPLY=()
- for ((i=COMP_CWORD-1;i>=0;i--))
- do case "\${COMP_WORDS[\$i]}" in
-EOM
-
- #This adds options for all subcommands
-
- printf '\t ("$1")\n\t\topts="%s"\n' "$optionsfromhelp ${subcommandsfromhelp[*]}"
- printf '\t break;;\n'
- for i in "${subcommandsfromhelp[@]}"; do
- printf '\t ("%s")\n' "$i"
- C="$($SWUPDCOMMAND $i --help 2>&1 | sed -e "$SEDSCRIPT" | tr '\n' ' ')"
- printf '\t\topts="%s"\n' "$C"
- printf '\t\tbreak;;\n'
- done
-
-# The tail of the script
-cat >> $SCRIPTNAME << 'EOM'
- esac
- done
- # Add in additional completion options if we need to
- if (( $i >= 0 ))
- then
- case "${COMP_WORDS[$i]}" in
- ("bundle-add")
- if [ -r /var/lib/swupd/version ] &&
- installed=$( $SCRIPTNAME
-
diff --git a/src/bundle.c b/src/bundle.c
index 6589cae2..529842b1 100644
--- a/src/bundle.c
+++ b/src/bundle.c
@@ -928,13 +928,12 @@ int list_local_bundles()
return EXIT_FAILURE;
}
while ((ent = readdir(dir))) {
- if ((strcmp(ent->d_name, ".") == 0) ||
- (strcmp(ent->d_name, "..") == 0)) {
+ if (ent->d_name[0] == '.') {
continue;
}
/* Need to dup the strings as the directory
* may be bigger than the size of the I/O buffer */
- char * name = strdup(ent->d_name);
+ char *name = strdup(ent->d_name);
if (!name) {
abort();
}
diff --git a/src/manifest.c b/src/manifest.c
index 07edc525..0105eb6a 100644
--- a/src/manifest.c
+++ b/src/manifest.c
@@ -742,6 +742,18 @@ verify_mom:
}
free_string(&log_cmd);
}
+ /* Make a copy of the Manifest for the completion code */
+ if (latest) {
+ char *momcopy;
+ rm_bundle_file(".MoM");
+ string_or_die(&momcopy, "/bin/cp \"%s\" \"%s/%s/.MoM\" 2>/dev/null",
+ filename, path_prefix, BUNDLES_DIR);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
+ (void)system(momcopy); /* If it fails it fails */
+#pragma GCC diagnostic pop
+ free(momcopy);
+ }
free_string(&filename);
free_string(&url);
return manifest;
diff --git a/src/subscriptions.c b/src/subscriptions.c
index da4192eb..dec6a5b8 100644
--- a/src/subscriptions.c
+++ b/src/subscriptions.c
@@ -84,7 +84,8 @@ void read_subscriptions(struct list **subs)
dir = opendir(path);
if (dir) {
while ((ent = readdir(dir))) {
- if ((strcmp(ent->d_name, ".") == 0) || (strcmp(ent->d_name, "..") == 0)) {
+ if (ent->d_name[0] == '.') {
+ /* ignore dot files, in particular .MoM */
continue;
}
if (ent->d_type == DT_REG) {
diff --git a/swupd.bash b/swupd.bash
new file mode 100644
index 00000000..147e47c9
--- /dev/null
+++ b/swupd.bash
@@ -0,0 +1,104 @@
+#!/bin/bash
+# Software Updater - autocompletion script
+#
+# Copyright © 2018 Intel Corporation.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 2 or later of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+#
+
+
+#declares the completion function
+_swupd()
+{
+ # $1 is the command being completed, $2 is the current word being expanded
+ local opts IFS=$' \t\n'
+ local -i i installed
+ COMPREPLY=()
+ for ((i=COMP_CWORD-1;i>=0;i--))
+ do case "${COMP_WORDS[$i]}" in
+ ("$1")
+ opts="--help --version autoupdate bundle-add bundle-remove bundle-list hashdump update verify check-update search info clean"
+ break;;
+ ("autoupdate")
+ opts="--help --enable --disable "
+ break;;
+ ("bundle-add")
+ opts="--help --url --contenturl --versionurl --port --path --format --force --nosigcheck --ignore-time --statedir --certpath --time --no-scripts --no-boot-update "
+ break;;
+ ("bundle-remove")
+ opts="--help --path --url --contenturl --versionurl --port --format --force --nosigcheck --ignore-time --statedir --certpath "
+ break;;
+ ("bundle-list")
+ opts="--help --all --url --contenturl --versionurl --path --format --nosigcheck --ignore-time --statedir --certpath --deps --has-dep "
+ break;;
+ ("hashdump")
+ opts="--help --no-xattrs --path "
+ break;;
+ ("update")
+ opts="--help --download --url --port --contenturl --versionurl --status --format --path --force --nosigcheck --ignore-time --statedir --certpath --time --no-scripts --no-boot-update --migrate --allow-mix-collisions "
+ break;;
+ ("verify")
+ opts="--help --manifest --path --url --port --contenturl --versionurl --fix --picky --picky-tree --picky-whitelist --install --format --quick --force --nosigcheck --ignore-time --statedir --certpath --time --no-scripts --no-boot-update "
+ break;;
+ ("check-update")
+ opts="--help --url --versionurl --port --format --force --nosigcheck --path --statedir "
+ break;;
+ ("search")
+ opts="--help --library --binary --scope --top --csv --display-files --init --ignore-time --url --contenturl --versionurl --port --path --format --statedir --certpath "
+ break;;
+ ("info")
+ opts=""
+ break;;
+ ("clean")
+ opts="--all --dry-run --statedir --help "
+ break;;
+ esac
+ done
+ # Add in additional completion options if we need to
+ if (( $i >= 0 ))
+ then
+ case "${COMP_WORDS[$i]}" in
+ ("bundle-add")
+ MoM=""
+ if [ -r /usr/share/clear/bundles/.MoM ]
+ then MoM=/usr/share/clear/bundles/.MoM
+ elif [ -r /var/lib/swupd/version ] &&
+ installed=$(