Skip to content

Commit 2cfe58a

Browse files
authored
Merge pull request #1159 from OpenAF/t8
T8
2 parents 49e6bca + 3db2744 commit 2cfe58a

File tree

4 files changed

+80
-31
lines changed

4 files changed

+80
-31
lines changed

complete/completion_oafp.sh

+49-16
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ F_in__in_sql_sqlparse_=1
5959
F_in__in_sql_sqloptions_=1
6060
F_in__in_toml=0
6161
F_in__in_xls=0
62-
F_in__in_xls_xlssheet_=1
63-
F_in__in_xls_xlsevalformulas_=1
64-
F_in__in_xls_xlscol_=1
65-
F_in__in_xls_xlsrow_=1
62+
F_in__in_xls_inxlssheet_=1
63+
F_in__in_xls_inxlsevalformulas_=1
64+
F_in__in_xls_inxlscol_=1
65+
F_in__in_xls_inxlsrow_=1
6666
F_in__in_xml=0
6767
F_in__in_xml_xmlignored_=1
6868
F_in__in_xml_xmlprefix_=1
@@ -241,6 +241,14 @@ F_searchkeys_=1
241241
F_searchvalues_=1
242242
F_sortmapkeys_=1
243243
F_trim_=1
244+
F_forcearray_=1
245+
F_secKey_=1
246+
F_secKey__secEnv_=0
247+
F_secKey__secFile_=0
248+
F_secKey__secMainPass_=0
249+
F_secKey__secPass_=0
250+
F_secKey__secBucket_=0
251+
F_secKey__secRepo_=0
244252

245253
# Iterate over the arguments
246254
if [ $# -gt 0 ]; then
@@ -305,10 +313,10 @@ if [ $# -gt 0 ]; then
305313
if [ "${arg#sqloptions=}" != "$arg" ]; then FFOUND=1; F_in__in_sql_sqloptions_=0; fi
306314
if [ "$arg" = "in=toml" ]; then FFOUND=1; F_in__in_toml=1; F_in_=0; fi
307315
if [ "$arg" = "in=xls" ]; then FFOUND=1; F_in__in_xls=1; F_in_=0; fi
308-
if [ "${arg#xlssheet=}" != "$arg" ]; then FFOUND=1; F_in__in_xls_xlssheet_=0; fi
309-
if [ "${arg#xlsevalformulas=}" != "$arg" ]; then FFOUND=1; F_in__in_xls_xlsevalformulas_=0; fi
310-
if [ "${arg#xlscol=}" != "$arg" ]; then FFOUND=1; F_in__in_xls_xlscol_=0; fi
311-
if [ "${arg#xlsrow=}" != "$arg" ]; then FFOUND=1; F_in__in_xls_xlsrow_=0; fi
316+
if [ "${arg#inxlssheet=}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlssheet_=0; fi
317+
if [ "${arg#inxlsevalformulas=}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlsevalformulas_=0; fi
318+
if [ "${arg#inxlscol=}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlscol_=0; fi
319+
if [ "${arg#inxlsrow=}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlsrow_=0; fi
312320
if [ "$arg" = "in=xml" ]; then FFOUND=1; F_in__in_xml=1; F_in_=0; fi
313321
if [ "${arg#xmlignored=}" != "$arg" ]; then FFOUND=1; F_in__in_xml_xmlignored_=0; fi
314322
if [ "${arg#xmlprefix=}" != "$arg" ]; then FFOUND=1; F_in__in_xml_xmlprefix_=0; fi
@@ -534,6 +542,15 @@ if [ $# -gt 0 ]; then
534542
if [ "$arg" = "sortmapkeys=" ]; then FFOUND=1; F_sortmapkeys_=0; fi
535543
# trim= single option
536544
if [ "$arg" = "trim=" ]; then FFOUND=1; F_trim_=0; fi
545+
# forcearray= single option
546+
if [ "$arg" = "forcearray=" ]; then FFOUND=1; F_forcearray_=0; fi
547+
# secKey= options
548+
if [ "$arg" = "secEnv=" ]; then FFOUND=1; F_secKey__secEnv_=1; F_secKey_=0; fi
549+
if [ "$arg" = "secFile=" ]; then FFOUND=1; F_secKey__secFile_=1; F_secKey_=0; fi
550+
if [ "$arg" = "secMainPass=" ]; then FFOUND=1; F_secKey__secMainPass_=1; F_secKey_=0; fi
551+
if [ "$arg" = "secPass=" ]; then FFOUND=1; F_secKey__secPass_=1; F_secKey_=0; fi
552+
if [ "$arg" = "secBucket=" ]; then FFOUND=1; F_secKey__secBucket_=1; F_secKey_=0; fi
553+
if [ "$arg" = "secRepo=" ]; then FFOUND=1; F_secKey__secRepo_=1; F_secKey_=0; fi
537554
done
538555
fi
539556

@@ -684,17 +701,17 @@ if [ $F_in__in_sql -eq 1 ]; then
684701
fi
685702
fi
686703
if [ $F_in__in_xls -eq 1 ]; then
687-
if [ $F_in__in_xls_xlssheet_ -eq 1 ]; then
688-
echo "xlssheet= The name of sheet to consider -default to the first sheet-"
704+
if [ $F_in__in_xls_inxlssheet_ -eq 1 ]; then
705+
echo "inxlssheet= The name of sheet to consider -default to the first sheet-"
689706
fi
690-
if [ $F_in__in_xls_xlsevalformulas_ -eq 1 ]; then
691-
echo "xlsevalformulas= If false the existing formulas won't be evaluated -defaults to true-"
707+
if [ $F_in__in_xls_inxlsevalformulas_ -eq 1 ]; then
708+
echo "inxlsevalformulas= If false the existing formulas won't be evaluated -defaults to true-"
692709
fi
693-
if [ $F_in__in_xls_xlscol_ -eq 1 ]; then
694-
echo "xlscol= The column on the sheet where a table should be detected -e.g. "A"-"
710+
if [ $F_in__in_xls_inxlscol_ -eq 1 ]; then
711+
echo "inxlscol= The column on the sheet where a table should be detected -e.g. "A"-"
695712
fi
696-
if [ $F_in__in_xls_xlsrow_ -eq 1 ]; then
697-
echo "xlsrow= The row on the sheet where a table should be detected -e.g. 1-"
713+
if [ $F_in__in_xls_inxlsrow_ -eq 1 ]; then
714+
echo "inxlsrow= The row on the sheet where a table should be detected -e.g. 1-"
698715
fi
699716
fi
700717
if [ $F_in__in_xml -eq 1 ]; then
@@ -1243,6 +1260,22 @@ if [ $F_trim_ -eq 1 ]; then
12431260
echo "trim= If true all the strings of the result map/list will be trimmed"
12441261

12451262
fi
1263+
# Print completion for forcearray=
1264+
if [ $F_forcearray_ -eq 1 ]; then
1265+
echo "forcearray= If true and if the input is map it will force it to be an array with that map as the only element"
1266+
1267+
fi
1268+
# Print completion for secKey=
1269+
if [ $F_secKey_ -eq 1 ]; then
1270+
echo "secKey= The mandatory sBucket bucket key to use"
1271+
1272+
echo "secEnv= A boolean flag to use environment variables as sBuckets"
1273+
echo "secFile= Optional sBucket file source"
1274+
echo "secMainPass= sBucket repository password"
1275+
echo "secPass= sBucket bucket password"
1276+
echo "secBucket= sBucket bucket name"
1277+
echo "secRepo= sBucket repository"
1278+
fi
12461279

12471280
# end
12481281
if [ $FFOUND -eq 0 ]; then

complete/completion_oafp.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -521,3 +521,20 @@ complete:
521521
desc: If true the resulting map keys will be sorted
522522
- name: trim=
523523
desc: If true all the strings of the result map/list will be trimmed
524+
- name: forcearray=
525+
desc: If true and if the input is map it will force it to be an array with that map as the only element
526+
- name: secKey=
527+
desc: The mandatory sBucket bucket key to use
528+
opts:
529+
- name: secEnv=
530+
desc: A boolean flag to use environment variables as sBuckets
531+
- name: secFile=
532+
desc: Optional sBucket file source
533+
- name: secMainPass=
534+
desc: sBucket repository password
535+
- name: secPass=
536+
desc: sBucket bucket password
537+
- name: secBucket=
538+
desc: sBucket bucket name
539+
- name: secRepo=
540+
desc: sBucket repository

js/materialize2.js

+5-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)