summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2018-10-14 18:24:35 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2018-10-15 12:28:23 -0400
commitd9588459d035cc3d890892c8a8b3adbd466797e5 (patch)
treefe37fd6f7aac97eb3b353100b3ceb37e1e9fb9a4
parentbb094e1fdbe5c0c365aabc46041de5e1ab9ec444 (diff)
libremakepkg: Tidy formatting of usage() flags
"What is the alignment of the libremakepkg options section based on?", you may ask. You'll see in the next commit!
-rw-r--r--po/es/libretools.po54
-rwxr-xr-xsrc/chroot-tools/libremakepkg27
2 files changed, 44 insertions, 37 deletions
diff --git a/po/es/libretools.po b/po/es/libretools.po
index 20bfd54..0a3dbc4 100644
--- a/po/es/libretools.po
+++ b/po/es/libretools.po
@@ -165,7 +165,7 @@ msgid "Don't update anything, just compare already downloaded files."
msgstr "No actualice nada, simplemente compare archivos ya descargados."
#: src/abslibre-tools/libredbdiff:159 src/abslibre-tools/librerelease:134
-#: src/chroot-tools/librechroot:295 src/chroot-tools/libremakepkg:183
+#: src/chroot-tools/librechroot:295 src/chroot-tools/libremakepkg:186
#: src/devtools/find-libdeps:39 src/librefetch/librefetch:92
#: src/pkgbuild-check-nonfree:58 src/pkgbuild-summarize-nonfree:41
#: src/toru/toru-path:51
@@ -774,15 +774,15 @@ msgstr "Crear una copia, eliminar una copia o sincronizar una copia puede "
"ser bastante lento; pero son muy rápidos si $CHROOTDIR está en una "
"partición btrfs."
-#: src/chroot-tools/librechroot:266 src/chroot-tools/libremakepkg:173
+#: src/chroot-tools/librechroot:266 src/chroot-tools/libremakepkg:174
msgid "CHROOT"
msgstr "CHROOT"
-#: src/chroot-tools/librechroot:266 src/chroot-tools/libremakepkg:173
+#: src/chroot-tools/librechroot:266 src/chroot-tools/libremakepkg:174
msgid "Name of the chroot to use"
msgstr "Nombre del chroot a usar"
-#: src/chroot-tools/librechroot:267 src/chroot-tools/libremakepkg:174
+#: src/chroot-tools/librechroot:267 src/chroot-tools/libremakepkg:175
msgid "COPY"
msgstr "COPIA"
@@ -817,18 +817,18 @@ msgid "Set the architecture of the copy; simply an alias for the `-C` and `-"
msgstr "Establecer la arquitectura de la copia; simplemente un alias para "
"las opciones `-C` y` -M`, vea arriba."
-#: src/chroot-tools/librechroot:273 src/chroot-tools/libremakepkg:175
+#: src/chroot-tools/librechroot:273 src/chroot-tools/libremakepkg:176
msgid "Bind mount a file or directory, read/write"
msgstr "Enlazar un archivo o directorio, lectura/escritura"
#: src/chroot-tools/librechroot:273 src/chroot-tools/librechroot:274
-#: src/chroot-tools/libremakepkg:175 src/chroot-tools/libremakepkg:176
+#: src/chroot-tools/libremakepkg:176 src/chroot-tools/libremakepkg:177
#, fuzzy
#| msgid "PATH[:PATH]"
msgid "PATH[:INSIDE_PATH[:OPTIONS]]"
msgstr "RUTA[:RUTA]"
-#: src/chroot-tools/librechroot:274 src/chroot-tools/libremakepkg:176
+#: src/chroot-tools/librechroot:274 src/chroot-tools/libremakepkg:177
msgid "Bind mount a file or directory, read-only"
msgstr "Enlazar-montar un archivo o directorio, de solo lectura"
@@ -954,7 +954,7 @@ msgstr "El comando `%s` requiere al menos un argumento"
msgid "This program must be run as root."
msgstr "Este programa debe ser ejecutado como root."
-#: src/chroot-tools/librechroot:435 src/chroot-tools/libremakepkg:275
+#: src/chroot-tools/librechroot:435 src/chroot-tools/libremakepkg:278
msgid "Waiting for existing lock on chroot copy to be released: [%s]"
msgstr "Esperando que el bloqueo existente en la copia de chroot sea "
"liberado: [%s]"
@@ -1048,15 +1048,19 @@ msgid "The `-n` and `-l` options behave identically to librechroot, see the "
msgstr "Las opciones `-n` y `-l` se comportan idénticamente a librechroot, "
"vea la documentación allí."
-#: src/chroot-tools/libremakepkg:172 src/chroot-tools/libremakepkg:177
-msgid " %s options:"
-msgstr "Opciones de %s:"
+#: src/chroot-tools/libremakepkg:173
+msgid "librechroot options:"
+msgstr ""
-#: src/chroot-tools/libremakepkg:174
+#: src/chroot-tools/libremakepkg:175
msgid "Name of, or absolute path to, the chroot copy to use"
msgstr "Nombre del, o ruta absoluta, de la copia del chroot a usar"
-#: src/chroot-tools/libremakepkg:178
+#: src/chroot-tools/libremakepkg:179
+msgid "libremakepkg options:"
+msgstr ""
+
+#: src/chroot-tools/libremakepkg:180
#, fuzzy
#| msgid "Don't disable networking during build() and package(). "
#| "PLEASE don't use this unless you have a special reason, its use is a "
@@ -1068,52 +1072,52 @@ msgstr "No deshabilita la conexión a internet durante build() y "
"package(). POR FAVOR no use esta opción al menos que tenga una razón "
"en especial, su uso es una violación a la política de Parabola."
-#: src/chroot-tools/libremakepkg:182
+#: src/chroot-tools/libremakepkg:184
msgid "Repackage contents of the package without rebuilding"
msgstr "Reempaqueta los contenidos del paquete sin recompilar"
-#: src/chroot-tools/libremakepkg:189
+#: src/chroot-tools/libremakepkg:192
msgid "The -%s flag does not make sense inside of a chroot"
msgstr "La opción -%s no tiene sentido dentro de un chroot"
-#: src/chroot-tools/libremakepkg:217
+#: src/chroot-tools/libremakepkg:220
msgid "Extra arguments: %s"
msgstr "Argumentos extras: %s"
-#: src/chroot-tools/libremakepkg:249
+#: src/chroot-tools/libremakepkg:252
msgid "This program must be run as root"
msgstr "Este programa debe ejecutarse como root"
-#: src/chroot-tools/libremakepkg:255
+#: src/chroot-tools/libremakepkg:258
msgid "PKGBUILD does not exist."
msgstr "El PKGBUILD no existe."
-#: src/chroot-tools/libremakepkg:266
+#: src/chroot-tools/libremakepkg:269
msgid "Waiting for existing lock on build directory to be released"
msgstr "Esperando a que se libere el bloqueo existente en el directorio de "
"compilación"
-#: src/chroot-tools/libremakepkg:277
+#: src/chroot-tools/libremakepkg:280
msgid "Initializing the chroot..."
msgstr "Iniciando el chroot..."
-#: src/chroot-tools/libremakepkg:287
+#: src/chroot-tools/libremakepkg:290
msgid "Starting pre-build activities..."
msgstr "Iniciando actividades previas a la compilación..."
-#: src/chroot-tools/libremakepkg:290
+#: src/chroot-tools/libremakepkg:293
msgid "Downloading sources..."
msgstr "Descargando las fuentes..."
-#: src/chroot-tools/libremakepkg:298
+#: src/chroot-tools/libremakepkg:301
msgid "Something went funny with makepkg --allsource"
msgstr ""
-#: src/chroot-tools/libremakepkg:317
+#: src/chroot-tools/libremakepkg:320
msgid "Starting to build the package..."
msgstr "Comenzando a compilar el paquete..."
-#: src/chroot-tools/libremakepkg:322
+#: src/chroot-tools/libremakepkg:325
msgid "Starting post-build activities..."
msgstr "Iniciando actividades posteriores a la compilación..."
diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg
index 00eb2e0..013b6d0 100755
--- a/src/chroot-tools/libremakepkg
+++ b/src/chroot-tools/libremakepkg
@@ -169,18 +169,21 @@ usage() {
the documentation there.'
echo
print 'Options:'
- print ' %s options:' librechroot
- flag "-n <$(_ CHROOT)>" 'Name of the chroot to use'
- flag "-l <$(_ COPY)>" 'Name of, or absolute path to, the chroot copy to use'
- flag "-w <$(_ 'PATH[:INSIDE_PATH[:OPTIONS]]')>" 'Bind mount a file or directory, read/write'
- flag "-r <$(_ 'PATH[:INSIDE_PATH[:OPTIONS]]')>" 'Bind mount a file or directory, read-only'
- print ' %s options:' libremakepkg
- flag '-N' "Don't disable networking during prepare(),
- build(), and package(). PLEASE don't use this
- unless you have a special reason, its use is a
- violation of Parabola policy."
- flag '-R' 'Repackage contents of the package without rebuilding'
- flag '-h' 'Show this message'
+
+ flag 'librechroot options:' \
+ "-n <$(_ CHROOT)>" 'Name of the chroot to use' \
+ "-l <$(_ COPY)>" 'Name of, or absolute path to, the chroot copy to use' \
+ "-w <$(_ 'PATH[:INSIDE_PATH[:OPTIONS]]')>" 'Bind mount a file or directory, read/write' \
+ "-r <$(_ 'PATH[:INSIDE_PATH[:OPTIONS]]')>" 'Bind mount a file or directory, read-only'
+
+ flag 'libremakepkg options:' \
+ '-N' "Don't disable networking during prepare(),
+ build(), and package(). PLEASE don't use
+ this unless you have a special reason, its
+ use is a violation of Parabola policy." \
+ '-R' 'Repackage contents of the package without
+ rebuilding' \
+ '-h' 'Show this message'
}
# Convenience method for use in option parsing