From 43cc89a39c1e86022110f6aaef529b8b312f10b9 Mon Sep 17 00:00:00 2001
From: James Tomasino <james@tomasino.org>
Date: Wed, 10 Jun 2020 22:36:56 +0000
Subject: [PATCH 01/15] option errors show usage
---
README.md | 2 +-
pb | 16 ++++++++++++----
pb.1 | 2 +-
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 97856c8..91134c9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-pb   
+pb   
------
**pb** is a helper utility for using 0x0 pastebin services
diff --git a/pb b/pb
index 14a3d05..164a41d 100755
--- a/pb
+++ b/pb
@@ -1,9 +1,9 @@
#!/bin/sh
# init variables
-version="v2020.01.20"
+version="v2020.06.10"
ENDPOINT="https://ttm.sh"
-flag_options="hvcufs::x"
+flag_options=":hvcufs::x"
flag_version=0
flag_help=0
flag_file=0
@@ -31,6 +31,12 @@ OPTIONAL FLAGS:
END
}
+show_usage() {
+ cat > /dev/stdout << END
+usage: pb [-hfvcux] [-s server_address] filename
+END
+}
+
# helper for program exit, supports error codes and messages
die () {
msg="$1"
@@ -59,14 +65,16 @@ fi
# attempt to parse options or die
if ! parsed=$(getopt ${flag_options} "$@"); then
- die "Invalid input" 2
+ printf "pb: unknown option\\n"
+ show_usage
+ exit 2
fi
# handle options
eval set -- "${parsed}"
while true; do
case "$1" in
- -h)
+ -h|?)
flag_help=1
;;
-v)
diff --git a/pb.1 b/pb.1
index 93222ef..bb8ac2d 100644
--- a/pb.1
+++ b/pb.1
@@ -1,4 +1,4 @@
-.TH PB 1 "20 January 2020" "v2020.01.20"
+.TH PB 1 "10 June 2020" "v2020.06.10"
.SH NAME
pb \- a helper utility for using 0x0 pastebin services
From 1cd68199aed29492d6a0517098d623df6d83d99a Mon Sep 17 00:00:00 2001
From: James Tomasino <james@tomasino.org>
Date: Wed, 10 Jun 2020 22:48:37 +0000
Subject: [PATCH 02/15] removing erroneous standards language
---
pb.1 | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/pb.1 b/pb.1
index bb8ac2d..a3a6afe 100644
--- a/pb.1
+++ b/pb.1
@@ -69,11 +69,5 @@ Shorten the URL to tilde.team
Report issues at the git repository at
.B https://tildegit.org/tomasino/pb
-.SH STANDARDS
-The
-.B pb
-utility is compliant with the IEEE Std 1003.1-2008 ("POSIX.1")
-specification.
-
.SH AUTHOR
-James Tomasino <tomasino (at) lavabit (dot) com>
+James Tomasino <james (at) tomasino (dot) org>
From f55024a9501ea71c3eaf156a64257f2fe1185abe Mon Sep 17 00:00:00 2001
From: James Tomasino <james@tomasino.org>
Date: Wed, 10 Jun 2020 22:53:17 +0000
Subject: [PATCH 03/15] bsd install instructions added
---
README.md | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/README.md b/README.md
index 91134c9..0e100a9 100644
--- a/README.md
+++ b/README.md
@@ -52,11 +52,20 @@ pb -u https://google.com
### Install
+On GNU systems:
+
`sudo make install`
_Note: On systems without admin access the binary can be run directly from the
git repo, but will lack `man` support and command completion._
+On BSD systems:
+
+```sh
+install 755 pb /usr/local/bin
+install 644 pb /usr/local/man/man1
+```
+
### Uninstall
`sudo make uninstall`
From adbabea22a8b56c758608cec6519735aa45e2f12 Mon Sep 17 00:00:00 2001
From: James Tomasino <james@tomasino.org>
Date: Sun, 5 Jul 2020 11:25:52 +0000
Subject: [PATCH 04/15] makefile using more standard variables and improved
bash completion tests
---
Makefile | 58 ++++++++++++++++++++++++++++++++------------------------
1 file changed, 33 insertions(+), 25 deletions(-)
diff --git a/Makefile b/Makefile
index c7667ed..4094123 100644
--- a/Makefile
+++ b/Makefile
@@ -1,42 +1,50 @@
-PREFIX ?= /usr/local
-BINDIR ?= $(PREFIX)/bin
-MANDIR ?= $(PREFIX)/share/man
+# Install to /usr/local unless otherwise specified, such as `make PREFIX=/app`
+PREFIX?=/usr/local
+
+# What to run to install various files
+INSTALL?=install
+# Run to install the actual binary
+INSTALL_PROGRAM=$(INSTALL) -Dm 755
+# Run to install application data, with differing permissions
+INSTALL_DATA=$(INSTALL) -Dm 644
+
+# Directories into which to install the various files
+bindir=$(DESTDIR)$(PREFIX)/bin
+sharedir=$(DESTDIR)$(PREFIX)/share
# Attempt to find bash completion dir in order of preference
ifneq ($(wildcard /etc/bash_completion.d/.),)
- CPLDIR ?= /etc/bash_completion.d
+ cpldir ?= /etc/bash_completion.d
endif
HAS_BREW := $(shell command -v brew 2> /dev/null)
ifdef HAS_BREW
- CPLDIR ?= $$(brew --prefix)/etc/bash_completion.d
+ cpldir ?= $$(brew --prefix)/etc/bash_completion.d
endif
HAS_PKGCONFIG := $(shell command -v pkg-config 2> /dev/null)
ifdef HAS_PKGCONFIG
- CPLDIR ?= $$(pkg-config --variable=completionsdir bash-completion 2> /dev/null)
+ cpldir ?= $$(pkg-config --variable=completionsdir bash-completion 2> /dev/null)
endif
-install:
- @echo Installing the executable to $(BINDIR)
- @install -D -m 0755 pb $(BINDIR)/pb
- @echo Installing the manual page to $(MANDIR)/man1
- @install -D -m 0644 pb.1 $(MANDIR)/man1/pb.1
-ifeq ($(CPLDIR),)
- @echo Installing the command completion to $(CPLDIR)
- @mkdir -p $(CPLDIR)
- @cp -f pb.d $(CPLDIR)/pb
- @chmod 644 $(CPLDIR)/pb
+help:
+ @echo "targets:"
+ @grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
+ | sed -n 's/^\(.*\): \(.*\)##\(.*\)/ \1|\3/p' \
+ | column -t -s '|'
+
+install: pb pb.1 ## system install
+ $(INSTALL_PROGRAM) pb $(bindir)/pb
+ $(INSTALL_DATA) pb.1 $(sharedir)/man/man1/pb.1
+ifdef cpldir
+ $(INSTALL_DATA) pb.d $(cpldir)/pb
endif
-uninstall:
- @echo Removing the executable from $(BINDIR)
- @rm -f $(BINDIR)/pb
- @echo Removing the manual page from $(MANDIR)/man1
- @rm -f $(BINDIR)/man1/pb.1
-ifeq ($(CPLDIR),)
- @echo Removing the command completion from $(CPLDIR)
- @rm -f $(CPLDIR)/pb
+uninstall: ## system uninstall
+ rm -f $(bindir)/pb
+ rm -f $(sharedir)/man/man1/pb.1
+ifdef cpldir
+ rm -f $(cpldir)/pb
endif
-.PHONY: install uninstall
+.PHONY: install uninstall help
From 9d91448c3a4bf3572e12c557a4d0deab8a53499e Mon Sep 17 00:00:00 2001
From: James Tomasino <james@tomasino.org>
Date: Sun, 5 Jul 2020 11:53:12 +0000
Subject: [PATCH 05/15] removes ineffective bash completion. simplifies install
---
Makefile | 21 ---------------------
README.md | 22 ++++++++++++++--------
pb | 16 ++--------------
pb.1 | 2 +-
pb.d | 28 ----------------------------
5 files changed, 17 insertions(+), 72 deletions(-)
delete mode 100644 pb.d
diff --git a/Makefile b/Makefile
index 4094123..a94100a 100644
--- a/Makefile
+++ b/Makefile
@@ -12,21 +12,6 @@ INSTALL_DATA=$(INSTALL) -Dm 644
bindir=$(DESTDIR)$(PREFIX)/bin
sharedir=$(DESTDIR)$(PREFIX)/share
-# Attempt to find bash completion dir in order of preference
-ifneq ($(wildcard /etc/bash_completion.d/.),)
- cpldir ?= /etc/bash_completion.d
-endif
-
-HAS_BREW := $(shell command -v brew 2> /dev/null)
-ifdef HAS_BREW
- cpldir ?= $$(brew --prefix)/etc/bash_completion.d
-endif
-
-HAS_PKGCONFIG := $(shell command -v pkg-config 2> /dev/null)
-ifdef HAS_PKGCONFIG
- cpldir ?= $$(pkg-config --variable=completionsdir bash-completion 2> /dev/null)
-endif
-
help:
@echo "targets:"
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
@@ -36,15 +21,9 @@ help:
install: pb pb.1 ## system install
$(INSTALL_PROGRAM) pb $(bindir)/pb
$(INSTALL_DATA) pb.1 $(sharedir)/man/man1/pb.1
-ifdef cpldir
- $(INSTALL_DATA) pb.d $(cpldir)/pb
-endif
uninstall: ## system uninstall
rm -f $(bindir)/pb
rm -f $(sharedir)/man/man1/pb.1
-ifdef cpldir
- rm -f $(cpldir)/pb
-endif
.PHONY: install uninstall help
diff --git a/README.md b/README.md
index 0e100a9..f90384a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-pb   
+pb   
------
**pb** is a helper utility for using 0x0 pastebin services
@@ -54,21 +54,27 @@ pb -u https://google.com
On GNU systems:
-`sudo make install`
-
-_Note: On systems without admin access the binary can be run directly from the
-git repo, but will lack `man` support and command completion._
+```sh
+sudo make install
+```
On BSD systems:
```sh
-install 755 pb /usr/local/bin
-install 644 pb /usr/local/man/man1
+doas gmake install
```
### Uninstall
-`sudo make uninstall`
+```sh
+sudo make uninstall
+```
+
+On BSD systems:
+
+```sh
+doas gmake uninstall
+```
## Contributing
diff --git a/pb b/pb
index 164a41d..af225f6 100755
--- a/pb
+++ b/pb
@@ -1,14 +1,13 @@
#!/bin/sh
# init variables
-version="v2020.06.10"
+version="v2020.07.05"
ENDPOINT="https://ttm.sh"
-flag_options=":hvcufs::x"
+flag_options=":hvcufs::"
flag_version=0
flag_help=0
flag_file=0
flag_url=0
-flag_shortlist=0
flag_colors=0
data=""
@@ -93,9 +92,6 @@ while true; do
-u)
flag_url=1
;;
- -x)
- flag_shortlist=1
- ;;
--)
shift
break
@@ -124,14 +120,6 @@ if [ ${flag_help} -gt 0 ]; then
die "" 0
fi
-# shortlist used for bash command completion
-if [ ${flag_shortlist} -gt 0 ]; then
- out="-f -v -h -s -c -u"
- lsresults="$(ls)"
- die "${out} ${lsresults}" 0
-fi
-
-
# Colors
if [ ${flag_colors} -gt 0 ]; then
SUCCESS=$(tput setaf 190)
diff --git a/pb.1 b/pb.1
index a3a6afe..a618e21 100644
--- a/pb.1
+++ b/pb.1
@@ -1,4 +1,4 @@
-.TH PB 1 "10 June 2020" "v2020.06.10"
+.TH PB 1 "05 July 2020" "v2020.07.05"
.SH NAME
pb \- a helper utility for using 0x0 pastebin services
diff --git a/pb.d b/pb.d
deleted file mode 100644
index c15622b..0000000
--- a/pb.d
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-_pb() {
-# Get basic autocomplete commands from the function itself
- local helplist
- helplist=$(pb -x)
-
-# Combine all the lists for autocomplete
- local cur
- cur=${COMP_WORDS[COMP_CWORD]}
- COMPREPLY=( $( compgen -W "$helplist" -- "$cur" ) )
-}
-
-# Detect if current shell is ZSH, and if so, load this file in bash
-# compatibility mode.
-if [ -n "$ZSH_VERSION" ]; then
- autoload bashcompinit
- bashcompinit
-fi
-
-complete -o default -o nospace -F _pb pb
-
-# The following are necessary only for Cygwin, and only are needed
-# when the user has tab-completed the executable name and consequently
-# included the '.exe' suffix.
-if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
- complete -o default -o nospace -F _pb pb.exe
-fi
From 565d5b5fc621eeb15e8ace3e391cc9946d574435 Mon Sep 17 00:00:00 2001
From: James Tomasino <james@tomasino.org>
Date: Sun, 5 Jul 2020 12:31:10 +0000
Subject: [PATCH 06/15] improved install instructions for bsd
---
README.md | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index f90384a..1ae4b02 100644
--- a/README.md
+++ b/README.md
@@ -60,8 +60,10 @@ sudo make install
On BSD systems:
+The man-path `/usr/local/share/man` is not indexed by default on openbsd. Using the `/usr` prefix works around this issue.
+
```sh
-doas gmake install
+doas make PREFIX=/usr install
```
### Uninstall
@@ -73,7 +75,7 @@ sudo make uninstall
On BSD systems:
```sh
-doas gmake uninstall
+doas make PREFIX=/usr uninstall
```
## Contributing
From 679a83f8982e1f687fbb468df894e1938d5adbce Mon Sep 17 00:00:00 2001
From: James Tomasino <james@tomasino.org>
Date: Sat, 5 Sep 2020 18:05:16 +0000
Subject: [PATCH 07/15] swaps grep for awk in make help
---
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index a94100a..0ca8413 100644
--- a/Makefile
+++ b/Makefile
@@ -14,15 +14,15 @@ sharedir=$(DESTDIR)$(PREFIX)/share
help:
@echo "targets:"
- @grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
- | sed -n 's/^\(.*\): \(.*\)##\(.*\)/ \1|\3/p' \
+ @awk -F '#' '/^[a-zA-Z0-9_-]+:.*?#/ { print $0 }' $(MAKEFILE_LIST) \
+ | sed -n 's/^\(.*\): \(.*\)#\(.*\)/ \1|-\3/p' \
| column -t -s '|'
-install: pb pb.1 ## system install
+install: pb pb.1 # system install
$(INSTALL_PROGRAM) pb $(bindir)/pb
$(INSTALL_DATA) pb.1 $(sharedir)/man/man1/pb.1
-uninstall: ## system uninstall
+uninstall: # system uninstall
rm -f $(bindir)/pb
rm -f $(sharedir)/man/man1/pb.1
From 78cf063beaf59e3ae631704fb67eacb4ac7cb098 Mon Sep 17 00:00:00 2001
From: James Tomasino <james@tomasino.org>
Date: Sat, 5 Sep 2020 18:11:07 +0000
Subject: [PATCH 08/15] setting version number for makefile fix
---
README.md | 2 +-
pb.1 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 1ae4b02..e84f25d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-pb   
+pb   
------
**pb** is a helper utility for using 0x0 pastebin services
diff --git a/pb.1 b/pb.1
index a618e21..be499b3 100644
--- a/pb.1
+++ b/pb.1
@@ -1,4 +1,4 @@
-.TH PB 1 "05 July 2020" "v2020.07.05"
+.TH PB 1 "05 September 2020" "v2020.09.05"
.SH NAME
pb \- a helper utility for using 0x0 pastebin services
From 849902f7293e90ce56b6b6d9d62157194e36e615 Mon Sep 17 00:00:00 2001
From: James Tomasino <james@tomasino.org>
Date: Fri, 23 Oct 2020 18:31:15 +0000
Subject: [PATCH 09/15] adds drone tests for shellcheck
---
.drone.yml | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 .drone.yml
diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..6f1df35
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,9 @@
+---
+kind: pipeline
+name: shellcheck
+
+steps:
+ - name: shellcheck
+ image: koalaman/shellcheck-alpine:stable
+ commands:
+ - shellcheck pb
From 1dfca9b2cd70a9349b779e108ef206c1e490b0c0 Mon Sep 17 00:00:00 2001
From: James Tomasino <james@tomasino.org>
Date: Fri, 23 Oct 2020 18:33:48 +0000
Subject: [PATCH 10/15] using drone build for status
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index e84f25d..533eac3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-pb   
+pb  [](https://drone.tildegit.org/tomasino/pb) 
------
**pb** is a helper utility for using 0x0 pastebin services
From f9883a8a76f4bf1b662d81f0467b97452be57b71 Mon Sep 17 00:00:00 2001
From: James Tomasino <james@tomasino.org>
Date: Tue, 27 Oct 2020 01:48:46 +0000
Subject: [PATCH 11/15] adds filetype override for standard input binary files
---
README.md | 9 ++++++++-
pb | 53 ++++++++++++++++++++++++++++++++++++-----------------
pb.1 | 9 ++++++++-
3 files changed, 52 insertions(+), 19 deletions(-)
diff --git a/README.md b/README.md
index 533eac3..51c4649 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-pb  [](https://drone.tildegit.org/tomasino/pb) 
+pb  [](https://drone.tildegit.org/tomasino/pb) 
------
**pb** is a helper utility for using 0x0 pastebin services
@@ -39,6 +39,12 @@ Shorten a URL
pb -u https://google.com
```
+Re-upload an image from the web
+
+```bash
+curl -s https://tildegit.org/_/static/img/gitea-lg.png | pb -e "png"
+```
+
### Options
```bash
@@ -48,6 +54,7 @@ pb -u https://google.com
-c Pretty color output
-u Shorten URL
-s server_address Use alternative pastebin server address
+ -e bin_extension Specify a binary file extension used in the upload
```
### Install
diff --git a/pb b/pb
index af225f6..e968331 100755
--- a/pb
+++ b/pb
@@ -1,15 +1,17 @@
#!/bin/sh
# init variables
-version="v2020.07.05"
+version="v2020.10.27"
ENDPOINT="https://ttm.sh"
-flag_options=":hvcufs::"
+flag_options=":hvcufe:s::"
flag_version=0
flag_help=0
flag_file=0
flag_url=0
flag_colors=0
+flag_ext=0
data=""
+EXT=""
# help message available via func
show_help() {
@@ -27,6 +29,7 @@ OPTIONAL FLAGS:
-c Pretty color output
-u Shorten URL
-s server_address Use alternative pastebin server address
+ -e bin_extension Specify a binary file extension used in the upload
END
}
@@ -55,13 +58,6 @@ die () {
exit "${code}"
}
-# is not interactive shell, use stdin
-if [ -t 0 ]; then
- flag_file=1
-else
- data="$(cat < /dev/stdin )"
-fi
-
# attempt to parse options or die
if ! parsed=$(getopt ${flag_options} "$@"); then
printf "pb: unknown option\\n"
@@ -85,6 +81,11 @@ while true; do
-f)
flag_file=1
;;
+ -e)
+ shift
+ flag_ext=1
+ EXT="$1"
+ ;;
-s)
shift
ENDPOINT="$1"
@@ -103,11 +104,6 @@ while true; do
shift
done
-# if data variable is empty (not a pipe) use params as fallback
-if [ -z "$data" ]; then
- data="$*"
-fi
-
# display current version
if [ ${flag_version} -gt 0 ]; then
printf "%s\\n" "${version}"
@@ -120,6 +116,24 @@ if [ ${flag_help} -gt 0 ]; then
die "" 0
fi
+# is not interactive shell, use stdin
+if [ -t 0 ]; then
+ flag_file=1
+else
+ if [ ${flag_ext} -gt 0 ]; then
+ # short-circuit stdin access to ensure binary data is transferred to curl
+ curl -sF"file=@-;filename=null.${EXT}" "${ENDPOINT}" < /dev/stdin
+ exit 0
+ else
+ data="$(cat < /dev/stdin )"
+ fi
+fi
+
+# if data variable is empty (not a pipe) use params as fallback
+if [ -z "$data" ]; then
+ data="$*"
+fi
+
# Colors
if [ ${flag_colors} -gt 0 ]; then
SUCCESS=$(tput setaf 190)
@@ -167,8 +181,13 @@ if [ ${flag_file} -gt 0 ]; then
fi
# check if file exists
if [ -f "${f}" ]; then
- # send file to endpoint
- result=$(curl -sF"file=@${f}" "${ENDPOINT}")
+ if [ ${flag_ext} -gt 0 ]; then
+ # send file to endpoint masked with new extension
+ result=$(curl -sF"file=@${f};filename=null.${EXT}" "${ENDPOINT}")
+ else
+ # send file to endpoint
+ result=$(curl -sF"file=@${f}" "${ENDPOINT}")
+ fi
printf "%s%s%s\\n" "$SUCCESS" "$result" "$RESET"
else
# print error message
@@ -189,7 +208,7 @@ else
printf "%sNo data found for upload. Please try again.%s\\n" "$ERROR" "$RESET"
else
# data available
- # send data to endpoint, print short url
+ # send data to endpoint
result=$(printf "%s" "${data}" | curl -sF"file=@-;filename=null.txt" "${ENDPOINT}")
printf "%s%s%s\\n" "$SUCCESS" "$result" "$RESET"
fi
diff --git a/pb.1 b/pb.1
index be499b3..256e2a9 100644
--- a/pb.1
+++ b/pb.1
@@ -1,4 +1,4 @@
-.TH PB 1 "05 September 2020" "v2020.09.05"
+.TH PB 1 "27 October 2020" "v2020.10.27"
.SH NAME
pb \- a helper utility for using 0x0 pastebin services
@@ -28,6 +28,13 @@ Explicitly interpret stdin as filename or names.
.BI -s " server_address"
Use alternative pastebin server address.
.TP
+.BI -e " bin_extension"
+Specifes the file extension used in the upload of binary content passed to
+.B pb
+via standard input.
+.I Note:
+this attribute will not work with file uploads or URL shortening.
+.TP
.B -u
Shorten a URL.
.TP
From c9a99eb94a564f6cf68c8336e0bfc292e702f031 Mon Sep 17 00:00:00 2001
From: James Tomasino <james@tomasino.org>
Date: Tue, 27 Oct 2020 01:51:01 +0000
Subject: [PATCH 12/15] -e option added to manpage
---
pb.1 | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pb.1 b/pb.1
index 256e2a9..f837387 100644
--- a/pb.1
+++ b/pb.1
@@ -71,6 +71,10 @@ Upload a file to a different pastebin endpoint
.TP
.B pb -u 'https://tilde.team'
Shorten the URL to tilde.team
+.TP
+.B curl -s https://some/image/file.png | pb -e "png"
+Download a binary file and re-upload it to the pastebin with an explicit binary
+type and extension.
.SH BUGS
Report issues at the git repository at
From a6cea6f11a60e7f1c7963c9ecad79d07f64ce4b2 Mon Sep 17 00:00:00 2001
From: James Tomasino <james@tomasino.org>
Date: Tue, 27 Oct 2020 01:59:49 +0000
Subject: [PATCH 13/15] manpage missing -e in synopsis
---
pb.1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb.1 b/pb.1
index f837387..b4ccee1 100644
--- a/pb.1
+++ b/pb.1
@@ -5,7 +5,7 @@ pb \- a helper utility for using 0x0 pastebin services
.SH SYNOPSIS
.B pb
-[-fucvh] [-s server_endpoint]
+[-fucvh] [-s server_endpoint] [-e bin_extension]
.P
.SH DESRIPTION
From c5d06b17f94eba8507e0fa2df319f8f1b7a4be2b Mon Sep 17 00:00:00 2001
From: James Tomasino <james@tomasino.org>
Date: Thu, 3 Nov 2022 16:57:07 +0000
Subject: [PATCH 14/15] updates getopt parsing and supports long opts. removes
shortening
---
pb | 87 ++++++++++++++++--------------------------------------------
pb.1 | 14 +++-------
2 files changed, 26 insertions(+), 75 deletions(-)
diff --git a/pb b/pb
index e968331..13efaed 100755
--- a/pb
+++ b/pb
@@ -1,13 +1,13 @@
#!/bin/sh
# init variables
-version="v2020.10.27"
+version="v2022.11.03"
ENDPOINT="https://ttm.sh"
-flag_options=":hvcufe:s::"
+flag_options=":hvcfe:s:"
+long_flag_options="help,version,color,file,extension:,server:"
flag_version=0
flag_help=0
flag_file=0
-flag_url=0
flag_colors=0
flag_ext=0
data=""
@@ -23,13 +23,12 @@ or
Uploads a file or data to the tilde 0x0 paste bin
OPTIONAL FLAGS:
- -h Show this help
- -v Show current version number
- -f Explicitly interpret stdin as filename
- -c Pretty color output
- -u Shorten URL
- -s server_address Use alternative pastebin server address
- -e bin_extension Specify a binary file extension used in the upload
+ -h | --help) Show this help
+ -v | --version) Show current version number
+ -f | --file) Explicitly interpret stdin as filename
+ -c | --color) Pretty color output
+ -s | --server server_address) Use alternative pastebin server address
+ -e | --extension bin_extension) Specify file extension used in the upload
END
}
@@ -59,49 +58,27 @@ die () {
}
# attempt to parse options or die
-if ! parsed=$(getopt ${flag_options} "$@"); then
+if ! PARSED_ARGUMENTS=$(getopt -a -n pb -o ${flag_options} --long ${long_flag_options} -- "$@"); then
printf "pb: unknown option\\n"
show_usage
exit 2
fi
-# handle options
-eval set -- "${parsed}"
-while true; do
+# For debugging: echo "PARSED_ARGUMENTS is $PARSED_ARGUMENTS"
+eval set -- "$PARSED_ARGUMENTS"
+while :
+do
case "$1" in
- -h|?)
- flag_help=1
- ;;
- -v)
- flag_version=1
- ;;
- -c)
- flag_colors=1
- ;;
- -f)
- flag_file=1
- ;;
- -e)
- shift
- flag_ext=1
- EXT="$1"
- ;;
- -s)
- shift
- ENDPOINT="$1"
- ;;
- -u)
- flag_url=1
- ;;
- --)
- shift
- break
- ;;
- *)
- die "Internal error: $1" 3
- ;;
+ -h | --help) flag_help=1 ; shift ;;
+ -v | --version) flag_version=1 ; shift ;;
+ -c | --color) flag_color=1 ; shift ;;
+ -f | --file) flag_file=1 ; shift ;;
+ -e | --extension) flag_ext=1; EXT="$2" ; shift 2 ;;
+ -s | --server) ENDPOINT="$2" ; shift 2 ;;
+ --) shift; break ;;
+ *) echo "Unexpected option: $1 - this should not happen."
+ show_usage ; die 3 ;;
esac
- shift
done
# display current version
@@ -145,24 +122,6 @@ else
RESET=""
fi
-# URL shortening reference
-
-# If URL mode detected, process URL shortener and end processing without
-# checking for a file to upload to the pastebin
-if [ ${flag_url} -gt 0 ]; then
-
- if [ -z "${data}" ]; then
- # if no data
- # print error message
- printf "%sProvide URL to shorten%s\\n" "$ERROR" "$RESET"
- else
- # shorten URL and print results
- result=$(curl -sF"shorten=${data}" "${ENDPOINT}")
- printf "%s%s%s\\n" "$SUCCESS" "$result" "$RESET"
- fi
- die "" 0
-fi
-
if [ ${flag_file} -gt 0 ]; then
# file mode
if [ -z "${data}" ]; then
diff --git a/pb.1 b/pb.1
index b4ccee1..662598d 100644
--- a/pb.1
+++ b/pb.1
@@ -1,4 +1,4 @@
-.TH PB 1 "27 October 2020" "v2020.10.27"
+.TH PB 1 "03 November 2022" "v2022.11.03"
.SH NAME
pb \- a helper utility for using 0x0 pastebin services
@@ -16,8 +16,8 @@ comes pre-configured with a specific pastebin, the
service endpoint can be overridden.
Data input can be provided as an argument or via stdin.
-The data will be processed as an image, text or URL to
-be shortened based on the context.
+The data will be processed as binary or text
+based on the context.
The options are as follows:
@@ -32,11 +32,6 @@ Use alternative pastebin server address.
Specifes the file extension used in the upload of binary content passed to
.B pb
via standard input.
-.I Note:
-this attribute will not work with file uploads or URL shortening.
-.TP
-.B -u
-Shorten a URL.
.TP
.B -c
Pretty color output.
@@ -69,9 +64,6 @@ Upload a list of files to the pastebin individually
.B pb -s http://0x0.st scores.txt
Upload a file to a different pastebin endpoint
.TP
-.B pb -u 'https://tilde.team'
-Shorten the URL to tilde.team
-.TP
.B curl -s https://some/image/file.png | pb -e "png"
Download a binary file and re-upload it to the pastebin with an explicit binary
type and extension.
From 053ebb142b76a44170bbf4a1c196d8fa7b01d116 Mon Sep 17 00:00:00 2001
From: James Tomasino <james@tomasino.org>
Date: Thu, 3 Nov 2022 17:08:12 +0000
Subject: [PATCH 15/15] updates readme
---
README.md | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/README.md b/README.md
index 51c4649..1f2f41a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-pb  [](https://drone.tildegit.org/tomasino/pb) 
+pb  [](https://drone.tildegit.org/tomasino/pb) 
------
**pb** is a helper utility for using 0x0 pastebin services
@@ -33,12 +33,6 @@ Upload a file to a different pastebin endpoint
pb -s http://0x0.st scores.txt
```
-Shorten a URL
-
-```bash
-pb -u https://google.com
-```
-
Re-upload an image from the web
```bash
@@ -48,13 +42,12 @@ curl -s https://tildegit.org/_/static/img/gitea-lg.png | pb -e "png"
### Options
```bash
- -h Show this help
- -v Show current version number
- -f Explicitly interpret stdin as filename
- -c Pretty color output
- -u Shorten URL
- -s server_address Use alternative pastebin server address
- -e bin_extension Specify a binary file extension used in the upload
+-h | --help) Show this help
+-v | --version) Show current version number
+-f | --file) Explicitly interpret stdin as filename
+-c | --color) Pretty color output
+-s | --server server_address) Use alternative pastebin server address
+-e | --extension bin_extension) Specify file extension used in the upload
```
### Install