Merge branch 'main' into p-git_repos

Author: PThorpe92

.github/workflows/apt.yml

@@ -0,0 +1,28 @@
+name: Apt Installation
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  push:
+    branches: [ main ]
+    paths:
+      - 'deb.asc'
+      - '.github/workflows/apt.yml'
+  pull_request:
+    branches: [ main ]
+    paths:
+      - 'deb.asc'
+      - '.github/workflows/apt.yml'
+jobs:
+  apt_installation:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install eza via apt repo
+        run: |
+          wget -qO- https://raw.githubusercontent.com/eza-community/eza/main/deb.asc | sudo tee /etc/apt/trusted.gpg.d/gierens.asc && \
+          echo "deb http://deb.gierens.de stable main" | sudo tee /etc/apt/sources.list.d/gierens.list && \
+          sudo apt update && \
+          sudo apt install -y eza
+      - name: Run eza
+        run: eza
+      - name: Open man page
+        run: man eza | cat

.github/workflows/conventional-commits.yml

@@ -0,0 +1,19 @@
+name: Conventional Commits
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    name: Conventional Commits
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: webiny/[email protected]
+        # optional, required for private repos
+        # with:
+        #   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/unit-tests.yml

@@ -4,14 +4,14 @@ on:
   push:
     branches: [ main ]
     paths:
-      - '.github/workflows/*'
+      - '.github/workflows/unit-tests.yml'
       - 'src/**'
       - 'Cargo.*'
       - build.rs
   pull_request:
     branches: [ main ]
     paths:
-      - '.github/workflows/*'
+      - '.github/workflows/unit-tests.yml'
       - 'src/**'
       - 'Cargo.*'
       - build.rs

README.md

@@ -141,6 +141,36 @@ On Gentoo, eza is available as a package [`sys-apps/eza`](https://packages.gento
 emerge --ask sys-apps/eza
 ```
 
+### openSUSE
+
+Eza is available at [openSUSE:Factory/eza](https://build.opensuse.org/package/show/openSUSE:Factory/eza):
+
+```bash
+zypper ar https://download.opensuse.org/tumbleweed/repo/oss/ factory-oss
+zypper in eza
+```
+
+The preceding repository also contains the Bash, Fish, and Zsh completions.
+
+### Fedora
+
+You can install Eza from [openSUSE:Factory/eza](https://build.opensuse.org/package/show/openSUSE:Factory/eza):
+
+```bash
+tee /etc/yum.repos.d/opensuse-tumbleweed-oss.repo <<EOL
+[opensuse-tumbleweed-oss]
+name=OpenSUSE Tumbleweed OSS
+baseurl=https://download.opensuse.org/tumbleweed/repo/oss/
+enabled=1
+gpgcheck=1
+gpgkey=https://download.opensuse.org/tumbleweed/repo/oss/repodata/repomd.xml.key
+EOL
+
+dnf install eza
+```
+
+The preceding repository also contains the Bash, Fish, and Zsh completions.
+
 ### Brew (MacOS)
 
 [![Homebrew package](https://repology.org/badge/version-for-repo/homebrew/eza.svg)](https://repology.org/project/eza/versions)
@@ -166,6 +196,19 @@ To install eza, run:
 sudo port install eza
 ```
 
+### Scoop (Windows)
+
+[![Windows package](https://repology.org/badge/version-for-repo/scoop/eza.svg)](https://repology.org/project/eza/versions)
+
+
+Eza is available from [Scoop](https://scoop.sh/#/apps?q=eza&id=a52070d25f94bbcc884f80bef53eb47ed1268198).
+
+To install eza, run:
+
+```shell
+scoop install eza
+```
+
 ---
 Click sections to expand.
 

completions/bash/eza

@@ -38,13 +38,13 @@ _eza()
         # _parse_help doesn’t pick up short options when they are on the same line than long options
         --*)
             # colo[u]r isn’t parsed correctly so we filter these options out and add them by hand
-            parse_help=$( eza --help | grep -oE ' (\-\-[[:alnum:]@-]+)' | tr -d ' ' | grep -v '\-\-colo' )
+            parse_help=$( eza --help | grep -oE ' (--[[:alnum:]@-]+)' | tr -d ' ' | grep -v '\--colo' )
             completions=$( echo '--color --colour --color-scale --colour-scale' $parse_help )
             COMPREPLY=( $( compgen -W "$completions" -- "$cur" ) )
             ;;
 
         -*)
-            completions=$( eza --help | grep -oE ' (\-[[:alnum:]@])' | tr -d ' ' )
+            completions=$( eza --help | grep -oE ' (-[[:alnum:]@])' | tr -d ' ' )
             COMPREPLY=( $( compgen -W "$completions" -- "$cur" ) )
             ;;
 

devtools/deb-package.sh

@@ -9,7 +9,7 @@ TAG=$(git describe --tags --abbrev=0)
 VERSION=${TAG:1}
 
 echo "checkout tag ${TAG}"
-git checkout --quiet ${TAG}
+git checkout --quiet "${TAG}"
 
 echo "build man pages"
 just man
@@ -20,7 +20,7 @@ TARGETS["arm64"]="aarch64-unknown-linux-gnu"
 TARGETS["armhf"]="arm-unknown-linux-gnueabihf"
 
 echo "download release notes"
-RELEASE_NOTES=$(curl -s ${REPO_URL}/releases/tag/${TAG})
+RELEASE_NOTES=$(curl -s "${REPO_URL}/releases/tag/${TAG}")
 
 for ARCH in "${!TARGETS[@]}"; do
     echo "building ${ARCH} package:"
@@ -40,29 +40,29 @@ for ARCH in "${!TARGETS[@]}"; do
     echo "    checksum ok"
 
     echo " -> creating directory structure"
-    mkdir -p ${DEB_TMP_DIR}
-    mkdir -p ${DEB_TMP_DIR}${DESTDIR}
-    mkdir -p ${DEB_TMP_DIR}${DOCDIR}
-    mkdir -p ${DEB_TMP_DIR}${DOCDIR}/man1
-    mkdir -p ${DEB_TMP_DIR}${DOCDIR}/man5
-    mkdir -p ${DEB_TMP_DIR}/DEBIAN
-    mkdir -p ${DEB_TMP_DIR}/usr/share/doc/${NAME}
-    chmod 755 -R ${DEB_TMP_DIR}
-    
+    mkdir -p "${DEB_TMP_DIR}"
+    mkdir -p "${DEB_TMP_DIR}${DESTDIR}"
+    mkdir -p "${DEB_TMP_DIR}${DOCDIR}"
+    mkdir -p "${DEB_TMP_DIR}${DOCDIR}/man1"
+    mkdir -p "${DEB_TMP_DIR}${DOCDIR}/man5"
+    mkdir -p "${DEB_TMP_DIR}/DEBIAN"
+    mkdir -p "${DEB_TMP_DIR}/usr/share/doc/${NAME}"
+    chmod 755 -R "${DEB_TMP_DIR}"
+
     echo " -> extract executable"
     tar -xzf "${ARCH}.tar.gz"
-    cp ${NAME} ${DEB_TMP_DIR}${DESTDIR}
-    chmod 755 ${DEB_TMP_DIR}${DESTDIR}/${NAME}
+    cp ${NAME} "${DEB_TMP_DIR}${DESTDIR}"
+    chmod 755 "${DEB_TMP_DIR}${DESTDIR}/${NAME}"
 
     echo " -> compress man pages"
-    gzip -cn9 target/man/eza.1 > ${DEB_TMP_DIR}${DOCDIR}man1/eza.1.gz
-    gzip -cn9 target/man/eza_colors.5 > ${DEB_TMP_DIR}${DOCDIR}man5/eza_colors.5.gz
-    gzip -cn9 target/man/eza_colors-explanation.5 > ${DEB_TMP_DIR}${DOCDIR}man5/eza_colors-explanation.5.gz
-    chmod 644 ${DEB_TMP_DIR}${DOCDIR}/**/*.gz
-    
+    gzip -cn9 target/man/eza.1 > "${DEB_TMP_DIR}${DOCDIR}man1/eza.1.gz"
+    gzip -cn9 target/man/eza_colors.5 > "${DEB_TMP_DIR}${DOCDIR}man5/eza_colors.5.gz"
+    gzip -cn9 target/man/eza_colors-explanation.5 > "${DEB_TMP_DIR}${DOCDIR}man5/eza_colors-explanation.5.gz"
+    chmod 644 "${DEB_TMP_DIR}${DOCDIR}"/**/*.gz
+
     echo " -> create control file"
-    touch ${DEB_TMP_DIR}/DEBIAN/control
-    cat > ${DEB_TMP_DIR}/DEBIAN/control <<EOM
+    touch "${DEB_TMP_DIR}/DEBIAN/control"
+    cat > "${DEB_TMP_DIR}/DEBIAN/control" <<EOM
 Package: ${NAME}
 Version: ${VERSION}
 Section: utils
@@ -78,17 +78,17 @@ Description: Modern replacement for ls
  It also has extra features not present in the original ls, such as viewing the
  Git status for a directory, or recursing into directories with a tree view.
 EOM
-    chmod 644 ${DEB_TMP_DIR}/DEBIAN/control
-    
+    chmod 644 "${DEB_TMP_DIR}/DEBIAN/control"
+
     echo " -> copy changelog"
-    cp CHANGELOG.md ${DEB_TMP_DIR}/usr/share/doc/${NAME}/changelog
-    gzip -cn9 ${DEB_TMP_DIR}/usr/share/doc/${NAME}/changelog > ${DEB_TMP_DIR}/usr/share/doc/${NAME}/changelog.gz
-    rm ${DEB_TMP_DIR}/usr/share/doc/${NAME}/changelog
-    chmod 644 ${DEB_TMP_DIR}/usr/share/doc/${NAME}/changelog.gz
-    
+    cp CHANGELOG.md "${DEB_TMP_DIR}/usr/share/doc/${NAME}/changelog"
+    gzip -cn9 "${DEB_TMP_DIR}/usr/share/doc/${NAME}/changelog" > "${DEB_TMP_DIR}/usr/share/doc/${NAME}/changelog.gz"
+    rm "${DEB_TMP_DIR}/usr/share/doc/${NAME}/changelog"
+    chmod 644 "${DEB_TMP_DIR}/usr/share/doc/${NAME}/changelog.gz"
+
     echo " -> create copyright file"
-    touch ${DEB_TMP_DIR}/usr/share/doc/${NAME}/copyright
-    cat > ${DEB_TMP_DIR}/usr/share/doc/${NAME}/copyright << EOM
+    touch "${DEB_TMP_DIR}/usr/share/doc/${NAME}/copyright"
+    cat > "${DEB_TMP_DIR}/usr/share/doc/${NAME}/copyright" << EOM
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ${NAME}
 Upstream-Contact: Christina Sørensen <[email protected]>
@@ -121,16 +121,16 @@ License: MIT
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 EOM
-    chmod 644 ${DEB_TMP_DIR}/usr/share/doc/${NAME}/copyright
-    
+    chmod 644 "${DEB_TMP_DIR}/usr/share/doc/${NAME}/copyright"
+
     echo " -> build ${ARCH} package"
-    dpkg-deb --build --root-owner-group ${DEB_TMP_DIR} > /dev/null
-    
+    dpkg-deb --build --root-owner-group "${DEB_TMP_DIR}" > /dev/null
+
     echo " -> cleanup"
-    rm -rf ${DEB_TMP_DIR} ${ARCH}.tar.gz ${NAME}
-    
+    rm -rf "${DEB_TMP_DIR}" "${ARCH}.tar.gz" "${NAME}"
+
     # gierens: this does not work on my arch at the moment and
     #          i'm verifying on the repo host anyway thus the || true
     echo " -> lint ${ARCH} package"
-    lintian ${DEB_PACKAGE} || true
+    lintian "${DEB_PACKAGE}" || true
 done

flake.nix

@@ -120,7 +120,7 @@
             singleStep = true;
             # set itests files creation date to unix epoch
             buildPhase = ''touch --date=@0 tests/itest/*'';
-            cargoTestOptions = opts: opts ++ [ "--features nix" ];
+            cargoTestOptions = opts: opts ++ ["--features nix"];
             inherit buildInputs;
           };
 
@@ -135,8 +135,8 @@
             singleStep = true;
             # set itests files creation date to unix epoch
             buildPhase = ''touch --date=@0 tests/itest/*; rm tests/cmd/*.stdout || echo; rm tests/cmd/*.stderr || echo;'';
-            cargoTestOptions = opts: opts ++ [ "--features nix" ];
-            TRYCMD="dump";
+            cargoTestOptions = opts: opts ++ ["--features nix"];
+            TRYCMD = "dump";
             postInstall = ''
               cp dump $out -r
             '';
@@ -155,6 +155,7 @@
           build = packages.check;
           test = packages.test;
           lint = packages.clippy;
+          trycmd = packages.trycmd;
         };
       }
     );

src/fs/dir.rs

@@ -42,6 +42,7 @@ impl Dir {
                           .map(|result| result.map(|entry| entry.path()))
                           .collect::<Result<_, _>>()?;
 
+        info!("Read directory success {:?}", &path);
         Ok(Self { contents, path })
     }
 

src/fs/feature/git.rs

@@ -332,7 +332,7 @@ fn reorient(path: &Path) -> PathBuf {
 
 #[cfg(windows)]
 fn reorient(path: &Path) -> PathBuf {
-    let unc_path = path.canonicalize().unwrap();
+    let unc_path = path.canonicalize().unwrap_or_else(|_| path.to_path_buf());
     // On Windows UNC path is returned. We need to strip the prefix for it to work.
     let normal_path = unc_path.as_os_str().to_str().unwrap().trim_start_matches("\\\\?\\");
     PathBuf::from(normal_path)

src/fs/file.rs

@@ -83,7 +83,8 @@ pub struct File<'dir> {
     pub extended_attributes: Vec<Attribute>,
 
     /// The absolute value of this path, used to look up mount points.
-    pub absolute_path: PathBuf,}
+    pub absolute_path: Option<PathBuf>,
+}
 
 impl<'dir> File<'dir> {
     pub fn from_args<PD, FN>(path: PathBuf, parent_dir: PD, filename: FN, deref_links: bool) -> io::Result<File<'dir>>
@@ -98,7 +99,7 @@ impl<'dir> File<'dir> {
         let metadata   = std::fs::symlink_metadata(&path)?;
         let is_all_all = false;
         let extended_attributes = File::gather_extended_attributes(&path);
-        let absolute_path = std::fs::canonicalize(&path)?;
+        let absolute_path = std::fs::canonicalize(&path).ok();
 
         Ok(File { name, ext, path, metadata, parent_dir, is_all_all, deref_links, extended_attributes, absolute_path })
     }
@@ -112,7 +113,7 @@ impl<'dir> File<'dir> {
         let is_all_all = true;
         let parent_dir = Some(parent_dir);
         let extended_attributes = File::gather_extended_attributes(&path);
-        let absolute_path = std::fs::canonicalize(&path)?;
+        let absolute_path = std::fs::canonicalize(&path).ok();
 
         Ok(File { path, parent_dir, metadata, ext, name: ".".into(), is_all_all, deref_links: false, extended_attributes, absolute_path })
     }
@@ -125,7 +126,7 @@ impl<'dir> File<'dir> {
         let is_all_all = true;
         let parent_dir = Some(parent_dir);
         let extended_attributes = File::gather_extended_attributes(&path);
-        let absolute_path = std::fs::canonicalize(&path)?;
+        let absolute_path = std::fs::canonicalize(&path).ok();
 
         Ok(File { path, parent_dir, metadata, ext, name: "..".into(), is_all_all, deref_links: false, extended_attributes, absolute_path })
     }
@@ -203,6 +204,7 @@ impl<'dir> File<'dir> {
     /// Returns an IO error upon failure, but this shouldn’t be used to check
     /// if a `File` is a directory or not! For that, just use `is_directory()`.
     pub fn to_dir(&self) -> io::Result<Dir> {
+        trace!("to_dir: reading dir");
         Dir::read_dir(self.path.clone())
     }
 
@@ -253,15 +255,18 @@ impl<'dir> File<'dir> {
     /// Whether this file is a mount point
     pub fn is_mount_point(&self) -> bool {
         if cfg!(target_os = "linux") && self.is_directory() {
-            return ALL_MOUNTS.contains_key(&self.absolute_path);
+            return match self.absolute_path.as_ref() {
+                Some(path) => ALL_MOUNTS.contains_key(path),
+                None => false,
+            }
         }
         false
     }
 
     /// The filesystem device and type for a mount point
     pub fn mount_point_info(&self) -> Option<&MountedFs> {
         if cfg!(target_os = "linux") {
-            return ALL_MOUNTS.get(&self.absolute_path);
+            return self.absolute_path.as_ref().and_then(|p|ALL_MOUNTS.get(p));
         }
         None
     }
@@ -324,7 +329,7 @@ impl<'dir> File<'dir> {
                     is_all_all: false,
                     deref_links: self.deref_links,
                     extended_attributes,
-                    absolute_path
+                    absolute_path: Some(absolute_path)
                 };
                 FileTarget::Ok(Box::new(file))
             }
@@ -527,6 +532,7 @@ impl<'dir> File<'dir> {
     /// but as mentioned in the size function comment above, different filesystems
     /// make it difficult to get any info about a dir by it's size, so this may be it.
     fn is_empty_directory(&self) -> bool {
+        trace!("is_empty_directory: reading dir");
         match Dir::read_dir(self.path.clone()) {
             // . & .. are skipped, if the returned iterator has .next(), it's not empty
             Ok(has_files) => has_files.files(super::DotFilter::Dotfiles, None, false, false).next().is_none(),