cleanup handling of symlinks and file/dir/symlinks at root directory

Fork: 0

tundra / trm

Browse code cleanup handling of symlinks and file/dir/symlinks at root directory master
1 parent f39d3f7 commit bcd721585fdc5effdac61c58086c90408afc4aaf tundra authored on 27 Oct 2016

Patch

Unified Split

Showing 2 changed files

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          TODO.txt
               - Fix copy/mv through symlink
- Handle filenames and destinations with spaces in them
- Make serial number postfix consistent across dirs and files
- Add -h help and usage screen
 
Doc Notes
---------
-- Fix copy/mv through symlink
 - Handle filenames and destinations with spaces in them
 - Make serial number postfix consistent across dirs and files
+- Add -h help and usage screen
 Doc Notes
 ---------

                Ignore Space
               Show notes
              View
            
          
          23 ■■■■■
          trm.sh
       # Symlinks require special care
      if [ -L $arg ]
      then
        REALPATH=$(readlink -f $(dirname  $arg))/$arg
 
        # Bare symlink itelf
        REALPATH=$(readlink -f $(dirname  $arg))
        if [ ${REALPATH} = '/' ]
        then
          REALPATH=""
        fi
 
        REALPATH=${REALPATH}/$(basename $arg)
 
      # Process normal files and directories
      else
        REALPATH=$(readlink -f $arg)
          SERIAL=".$(date +%Y%m%d%H%M%S)"
      fi
 
      SRCDIR=$(dirname $REALPATH)
      if [ ${SRCDIR} = '/' ]
      then
        SRCDIR=""
      fi
      SRCFIL=$(basename $REALPATH)
      DESDIR=${GRAVEYARD}${SRCDIR}
      DESFIL="${SRCFIL}${SERIAL}"
 
      CMD="${OPERATOR} $VERBOSE '${REALPATH}' '${DESDIR}/${DESFIL}'"
 
      if [ -n "${TESTMODE}" ]
      then
        echo ${TESTMODE}
        echo ${CMD}
       # Symlinks require special care
       if [ -L $arg ]
       then
+        REALPATH=$(readlink -f $(dirname  $arg))/$arg
+        # Bare symlink itelf
+        REALPATH=$(readlink -f $(dirname  $arg))
+        if [ ${REALPATH} = '/' ]
+        then
+          REALPATH=""
+        fi
+        REALPATH=${REALPATH}/$(basename $arg)
       # Process normal files and directories
       else
         REALPATH=$(readlink -f $arg)
           SERIAL=".$(date +%Y%m%d%H%M%S)"
       fi
       SRCDIR=$(dirname $REALPATH)
+      if [ ${SRCDIR} = '/' ]
+      then
+        SRCDIR=""
+      fi
       SRCFIL=$(basename $REALPATH)
       DESDIR=${GRAVEYARD}${SRCDIR}
       DESFIL="${SRCFIL}${SERIAL}"
       CMD="${OPERATOR} $VERBOSE '${REALPATH}' '${DESDIR}/${DESFIL}'"
       if [ -n "${TESTMODE}" ]
       then
         echo ${TESTMODE}
         echo ${CMD}

Show line notes below