Próba wdrożenia bash-completion dla narzędzi autorskich immudex cz.2

diff --git a/tools/completions/immudex-branch b/tools/completions/immudex-branch
index 23eeafac18b7ea39890e2800e3c01fcda96e8a3f..05104b9e3c6e2655019a1791ea2d55b3923f7736 100644 (file)
--- a/tools/completions/immudex-branch
+++ b/tools/completions/immudex-branch
@@ -1,4 +1,4 @@
-# immudex-branch completion                                -*- shell-script -*-
+#!/bin/bash
 
 idx_simple_options_complete() 
 {
@@ -13,7 +13,7 @@ idx_simple_options_complete()
     return 0;
   fi
   return 0;
-} &&
-    complete -F idx_simple_options_complete immudex-branch
+}
+
+complete -F idx_simple_options_complete immudex-branch
 
-# ex: filetype=sh

diff --git a/tools/completions/immudex-cdrip b/tools/completions/immudex-cdrip
index 811bf6d2dc5bb01df95cff55e5685324434ff11e..c2666d7131c87b895b3084c1f225fb64201918be 100644 (file)
--- a/tools/completions/immudex-cdrip
+++ b/tools/completions/immudex-cdrip
@@ -1,4 +1,5 @@
-# immudex-cdrip completion                                -*- shell-script -*-
+#!/bin/bash
+
 idx_cdrip_complete() {
   local cur;
   
@@ -11,7 +12,6 @@ idx_cdrip_complete() {
     return 0;
   fi
   return 0;
-} &&
-    complete -F idx_cdrip_complete immudex-cdrip
+}
 
-# ex: filetype=sh
+complete -F idx_cdrip_complete immudex-cdrip

diff --git a/tools/completions/immudex-create-media b/tools/completions/immudex-create-media
index 5e7be899bde622b52bd9eac1e0a836393eca2645..7e8e13eb73fe7f7450ef47bd71936b7f19c8de4a 100644 (file)
--- a/tools/completions/immudex-create-media
+++ b/tools/completions/immudex-create-media
@@ -1,4 +1,4 @@
-# immudex-create-media completion                          -*- shell-script -*-
+#!/bin/bash
 
 disk_list() {
   i=0;
@@ -32,7 +32,6 @@ idx_create_media_complete() {
     esac
   fi
   return 0
-} &&
-    complete -F idx_create_media_complete immudex-create-media
+}
 
-# ex: filetype=sh
+complete -F idx_create_media_complete immudex-create-media

diff --git a/tools/completions/immudex-crypt b/tools/completions/immudex-crypt
index a4f5de9398a996adc9d18eff085a84ba9b45a0c1..e1b2d62329b371d8a1632ca05309bafc19470d5e 100644 (file)
--- a/tools/completions/immudex-crypt
+++ b/tools/completions/immudex-crypt
@@ -1,4 +1,4 @@
-# immudex-crypt completion                                -*- shell-script -*-
+#!/bin/bash
 
 return_ic_index() {
   echo -n "$(ls /dev/mapper | grep 'immudex-crypt[0-9]*' | grep -o '[0-9]*' | awk '{printf $1" " }')";
@@ -36,7 +36,6 @@ idx_crypt_complete() {
     esac
   fi
   return 0;
-} &&
-    complete -F idx_crypt_complete immudex-crypt
+}
 
-# ex: filetype=sh
+complete -F idx_crypt_complete immudex-crypt

diff --git a/tools/completions/immudex-hostname b/tools/completions/immudex-hostname
index 7cedad2f55275e3861d03bfa0f25b2086b761088..36eb476fa8090ef09e31e00ffd9aeef32121f60e 100644 (file)
--- a/tools/completions/immudex-hostname
+++ b/tools/completions/immudex-hostname
@@ -1,4 +1,4 @@
-# immudex-hostname completion                              -*- shell-script -*-
+#!/bin/bash
 
 idx_simple_options_complete() 
 {
@@ -13,7 +13,6 @@ idx_simple_options_complete()
     return 0;
   fi
   return 0;
-} &&
-    complete -F idx_simple_options_complete immudex-hostname
+}
 
-# ex: filetype=sh
+complete -F idx_simple_options_complete immudex-hostname

diff --git a/tools/completions/immudex-import-gpgkeys b/tools/completions/immudex-import-gpgkeys
index 36382a61c669a33e682ffd39cd06e3b8c8182569..3e9da7850b93c7e1382086a154d1250c50c86dd0 100644 (file)
--- a/tools/completions/immudex-import-gpgkeys
+++ b/tools/completions/immudex-import-gpgkeys
@@ -1,4 +1,4 @@
-# immudex-import-gpgkeys completion                        -*- shell-script -*-
+#!/bin/bash
 
 idx_simple_options_complete() 
 {
@@ -13,7 +13,6 @@ idx_simple_options_complete()
     return 0;
   fi
   return 0;
-} &&
-    complete -F idx_simple_options_complete immudex-import-gpgkeys
+}
 
-# ex: filetype=sh
+complete -F idx_simple_options_complete immudex-import-gpgkeys

diff --git a/tools/completions/immudex-import-sshkeys b/tools/completions/immudex-import-sshkeys
index 4d11be0fac456f42a3cedbbc7123d820cf36c270..e5d412862819b1fa1c782f736f5f30051691a756 100644 (file)
--- a/tools/completions/immudex-import-sshkeys
+++ b/tools/completions/immudex-import-sshkeys
@@ -1,4 +1,5 @@
-# immudex-import-sshkeys completion                        -*- shell-script -*-
+#!/bin/bash
+
 idx_import_sshkeys_complete() {
  local cur;
 
@@ -12,7 +13,6 @@ idx_import_sshkeys_complete() {
   fi
   return 0;
  
-} &&
-    complete -F idx_import_sshkeys_complete immudex-import-sshkeys
+}
 
-# ex: filetype=sh
+complete -F idx_import_sshkeys_complete immudex-import-sshkeys

diff --git a/tools/completions/immudex-install b/tools/completions/immudex-install
index dc8769c3e35a1bd0d42352c623a6c2ec5c3fa425..d7fc8106a29768cc77b13364cdd8b7085a9085d3 100644 (file)
--- a/tools/completions/immudex-install
+++ b/tools/completions/immudex-install
@@ -1,4 +1,5 @@
-# immudex-install completion                               -*- shell-script -*-
+#!/bin/bash
+
 idx_install_complete() {
  local cur;
 
@@ -12,7 +13,7 @@ idx_install_complete() {
   fi
   return 0;
  
-} &&
-    complete -F idx_install_complete immudex-install
+}
+
+complete -F idx_install_complete immudex-install
 
-# ex: filetype=sh

diff --git a/tools/completions/immudex-meteo b/tools/completions/immudex-meteo
index 9f85a9692d45b87515d35089c2e5174aed9165ff..2c2b16f338359469f316c9cd7ffc78891713684a 100644 (file)
--- a/tools/completions/immudex-meteo
+++ b/tools/completions/immudex-meteo
@@ -1,4 +1,4 @@
-# immudex-meteo completion                                 -*- shell-script -*-
+#!/bin/bash
 
 idx_meteo_complete() {
 local cur prev
@@ -23,7 +23,7 @@ local cur prev
     esac
   fi
   return 0;
-} &&
-    complete -F idx_meteo_complete immudex-meteo
+}
+
+complete -F idx_meteo_complete immudex-meteo
 
-# ex: filetype=sh

diff --git a/tools/completions/immudex-morketsmerke b/tools/completions/immudex-morketsmerke
index 76fcb299b265dc4d188692fd93c025d75cdba636..f8a4cc48f2be0c6e4354057e62599ce1cf81ef2a 100644 (file)
--- a/tools/completions/immudex-morketsmerke
+++ b/tools/completions/immudex-morketsmerke
@@ -1,4 +1,4 @@
-# immudex-morketsmerke completion                          -*- shell-script -*-
+#!/bin/bash
 
 idx_morketsmerke_complete() {
  local cur;
@@ -13,7 +13,7 @@ idx_morketsmerke_complete() {
   fi
   return 0;
  
-} &&
-    complete -F idx_morketsmerke_complete immudex-morketsmerke
+}
+
+complete -F idx_morketsmerke_complete immudex-morketsmerke
 
-# ex: filetype=sh

diff --git a/tools/completions/immudex-motd b/tools/completions/immudex-motd
index f7d31e090df101ee2ad11528a0f8439fa9481d85..1b61a5d242d232dfa39a4b215811a825b06069a2 100644 (file)
--- a/tools/completions/immudex-motd
+++ b/tools/completions/immudex-motd
@@ -1,4 +1,4 @@
-# immudex-motd completion                                -*- shell-script -*-
+#!/bin/bash
 
 idx_simple_options_complete() 
 {
@@ -13,7 +13,7 @@ idx_simple_options_complete()
     return 0;
   fi
   return 0;
-} &&
-    complete -F idx_simple_options_complete immudex-motd
+}
+
+complete -F idx_simple_options_complete immudex-motd
 
-# ex: filetype=sh

diff --git a/tools/completions/immudex-padlock b/tools/completions/immudex-padlock
index 0b1b40236bc6dba3299936cd523f4bfb15a3b236..6f414c48747f6e2447206c704036c35df016ee24 100644 (file)
--- a/tools/completions/immudex-padlock
+++ b/tools/completions/immudex-padlock
@@ -1,4 +1,4 @@
-# immudex-padlock completion                                -*- shell-script -*-
+#!/bin/bash
 
 idx_simple_options_complete() 
 {
@@ -13,7 +13,6 @@ idx_simple_options_complete()
     return 0;
   fi
   return 0;
-} &&
-    complete -F idx_simple_options_complete immudex-padlock
+}
 
-# ex: filetype=sh
+complete -F idx_simple_options_complete immudex-padlock

diff --git a/tools/completions/immudex-pl b/tools/completions/immudex-pl
index 899c95c8e9816571bf5afb5dcad0ba77a5ec3416..62cd61c147b47632af1610b1bdcfc2a9bbbe9c13 100644 (file)
--- a/tools/completions/immudex-pl
+++ b/tools/completions/immudex-pl
@@ -1,4 +1,5 @@
-# immudex-pl completion                                    -*- shell-script -*-
+#!/bin/bash
+
 idx_pl_complete() {
  local cur;
 
@@ -12,7 +13,6 @@ idx_pl_complete() {
   fi
   return 0;
  
-} &&
-    complete -F idx_pl_complete immudex-pl
+}
 
-# ex: filetype=sh
+complete -F idx_pl_complete immudex-pl

diff --git a/tools/completions/immudex-run b/tools/completions/immudex-run
index 5b18a055a6652ae379f2f4e31a097ef47f9995fc..45fd18fa9016c060637c04d63192e96a1e62b090 100644 (file)
--- a/tools/completions/immudex-run
+++ b/tools/completions/immudex-run
@@ -1,4 +1,4 @@
-# immudex-run completion                                -*- shell-script -*-
+#!/bin/bash
 
 idx_simple_options_complete() 
 {
@@ -13,7 +13,7 @@ idx_simple_options_complete()
     return 0;
   fi
   return 0;
-} &&
-    complete -F idx_simple_options_complete immudex-run
+}
+
+complete -F idx_simple_options_complete immudex-run
 
-# ex: filetype=sh

diff --git a/tools/completions/immudex-secured-firefox b/tools/completions/immudex-secured-firefox
index 11beb37a104b277600f7588b7786d53ef27eb7da..b3069af01c59fddcd7d5b70e8e8cc7f3533e8a3c 100644 (file)
--- a/tools/completions/immudex-secured-firefox
+++ b/tools/completions/immudex-secured-firefox
@@ -1,4 +1,4 @@
-# immudex-secured-firefox completion                       -*- shell-script -*-
+#!/bin/bash
 
 idx_simple_options_complete() 
 {
@@ -13,7 +13,7 @@ idx_simple_options_complete()
     return 0;
   fi
   return 0;
-} &&
-    complete -F idx_simple_options_complete immudex-secured-firefox
+}
+
+complete -F idx_simple_options_complete immudex-secured-firefox
 
-# ex: filetype=sh

diff --git a/tools/completions/immudex-secured-librewolf b/tools/completions/immudex-secured-librewolf
index 74ee4b13881cb9bbce2224891b42fd7f01f892b3..87bf0de68212b5462a221680fd9b4b5f077f24b6 100644 (file)
--- a/tools/completions/immudex-secured-librewolf
+++ b/tools/completions/immudex-secured-librewolf
@@ -1,4 +1,4 @@
-# immudex-secured-librewolf completion                     -*- shell-script -*-
+#!/bin/bash
 
 idx_simple_options_complete() 
 {
@@ -13,7 +13,6 @@ idx_simple_options_complete()
     return 0;
   fi
   return 0;
-} &&
-    complete -F idx_simple_options_complete immudex-secured-librewolf
+}
 
-# ex: filetype=sh
+complete -F idx_simple_options_complete immudex-secured-librewolf

diff --git a/tools/completions/immudex-shoutcasts b/tools/completions/immudex-shoutcasts
index 67b11cfb0052a145ce3e9464ecc16a151906b556..a823a2fc3ea8f8bafe711c05d3047785c1d016d0 100644 (file)
--- a/tools/completions/immudex-shoutcasts
+++ b/tools/completions/immudex-shoutcasts
@@ -1,4 +1,5 @@
-# immudex-shoutcasts completion                            -*- shell-script -*-
+#!/bin/bash
+
 idx_shoutcasts_complete() {
  local cur prev
 
@@ -17,7 +18,6 @@ idx_shoutcasts_complete() {
     esac
   fi
   return 0;
-} &&
-    complete -F idx_shoutcasts_complete immudex-shoutcasts
+}
 
-# ex: filetype=sh
+complete -F idx_shoutcasts_complete immudex-shoutcasts

diff --git a/tools/completions/immudex-upgrade b/tools/completions/immudex-upgrade
index 481401555d06323fabe2b56c2e353658177c2d22..3394275993e953442bbef0cb6954c53d1fc110a1 100644 (file)
--- a/tools/completions/immudex-upgrade
+++ b/tools/completions/immudex-upgrade
@@ -1,4 +1,5 @@
-# immudex-upgrade completion                               -*- shell-script -*-
+#!/bin/bash
+
 idx_upgrade_complete() {
  local cur;
 
@@ -12,7 +13,7 @@ idx_upgrade_complete() {
   fi
   return 0;
  
-} &&
-    complete -F idx_simple_options_complete immudex-branch
+}
+
+complete -F idx_simple_options_complete immudex-branch
 
-# ex: filetype=sh

diff --git a/tools/completions/immudex-version b/tools/completions/immudex-version
index a7ed4b7102a214d0a8c6515ac7efab041e6ce4f7..ded414b1ff83418ae2bcfa94a86b584fd9b3bdd4 100644 (file)
--- a/tools/completions/immudex-version
+++ b/tools/completions/immudex-version
@@ -1,4 +1,4 @@
-# immudex-version completion                               -*- shell-script -*-
+#!/bin/bash
 
 idx_simple_options_complete() 
 {
@@ -13,7 +13,6 @@ idx_simple_options_complete()
     return 0;
   fi
   return 0;
-} &&
-    complete -F idx_simple_options_complete immudex-version
-
-# ex: filetype=sh
+}
+    
+complete -F idx_simple_options_complete immudex-version

diff --git a/tools/completions/immudex-ytplay b/tools/completions/immudex-ytplay
index 3da1563a6aad9cc435a40355834e719e9899be78..770ff699eeac689a87199955e6c675c322a1a715 100644 (file)
--- a/tools/completions/immudex-ytplay
+++ b/tools/completions/immudex-ytplay
@@ -1,4 +1,4 @@
-# immudex-ytplay completion                                -*- shell-script -*-
+#!/bin/bash
 
 idx_ytplay_complete() {
  local cur;
@@ -16,7 +16,6 @@ idx_ytplay_complete() {
     esac
   fi
   return 0;
-} &&
-    complete -F idx_ytplay_complete immudex-ytplay
+}
 
-# ex: filetype=sh
+complete -F idx_ytplay_complete immudex-ytplay