shellchecked and fixed realpath and DISPLAY var test

3 files changed, 7 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 85de22c3fda4..bde5ed72de3d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,7 +10,7 @@ pkgbase = upaste
 	optdepends = xclip: Command line interface to the X11 clipboard
 	source = up
 	source = UNLICENSE
-	sha256sums = 4e668585d0424b86aa98f7349177339966955adb1aeb39ca34205c468d5b3c1c
+	sha256sums = 4775536bcc695a19e1559fbed27479a309d062cae8f1cd3fd125fb8ed1eec012
 	sha256sums = 6b0382b16279f26ff69014300541967a356a666eb0b91b422f6862f6b7dad17e
 
 pkgname = upaste
diff --git a/PKGBUILD b/PKGBUILD
index 6db8c065aa15..055d9f02c85d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ optdepends=('wl-clipboard: Command-line copy/paste utilities for Wayland',
 depends=('curl')
 source=("up"
 		"UNLICENSE")
-sha256sums=("4e668585d0424b86aa98f7349177339966955adb1aeb39ca34205c468d5b3c1c"
+sha256sums=("4775536bcc695a19e1559fbed27479a309d062cae8f1cd3fd125fb8ed1eec012"
 "6b0382b16279f26ff69014300541967a356a666eb0b91b422f6862f6b7dad17e")
 
 package() {
diff --git a/up b/up
index 0f26e729765c..59958b69c392 100755
--- a/up
+++ b/up
@@ -36,11 +36,6 @@ EOF
 
 upload () {
 
-  # Set vars
-  local args
-  local ext
-  local file
-
   # If extension is set with -t option, set curl ext
   if [ -n "$extension" ]
   then
@@ -50,7 +45,7 @@ upload () {
   if [ -z "$1" ]
   then
     # If argument is empty, upload stdin
-    local file="file=@-"
+    file="file=@-"
 
     # If curl ext not set, set it to .txt
     if [ -z "$ext" ]
@@ -60,7 +55,7 @@ upload () {
 
   else
     # Else upload filename
-    local file="file=@\"$1\""
+    file="file=@\"$1\""
   fi
 
   args="$file;$ext"
@@ -71,7 +66,7 @@ upload () {
 
 autocopy () {
   # If xorg or wayland is running
-  if [ -n 'DISPLAY' ]
+  if [ -n "$DISPLAY" ]
   then
     # If xclip is installed
     if which xclip >/dev/null 2>&1
@@ -87,7 +82,7 @@ autocopy () {
 
 is_file () {
   # Test if first argument is an existing file
-  if [ ! -f "$(readlink $1)" ]
+  if [ ! -f "$(realpath "$1")" ]
   then
     echo "File \"$1\" does not exist or is not a regular file"
     exit 2
@@ -96,9 +91,6 @@ is_file () {
 
 main () {
 
-  # Vars
-  local url
-
   # If no piped data
   if [ -t 0 ]
   then
@@ -147,7 +139,7 @@ while getopts "hat:" arg
 do
   case $arg in
     a)
-      AUTOCOPY=0
+      autocopy=0
       ;;
     h)
       usage