various fixes and updates

[distro-setup] / distro-pkgs

diff --git a/distro-pkgs b/distro-pkgs
index aded66a91c88a7b2ca8274f8dcdc3af1db48bcc4..ab6fa6495689aecb723f9ca561d9ee368b049e46 100755 (executable)
--- a/distro-pkgs
+++ b/distro-pkgs
@@ -1,6 +1,7 @@
-#!/bin/bash -l
-
-err-catch
+#!/bin/bash
+# Copyright (C) 2019 Ian Kelling
+# SPDX-License-Identifier: AGPL-3.0-or-later
+if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi
 
 
 usage() {
@@ -153,12 +154,6 @@ case $distro in
   *) : ;; # comes default or with other packages
 esac
 
-case $distro in
-  arch) e firefox pulseaudio ;;
-  trisquel) e abrowser ;;
-  *) : ;; # comes default or with other packages, or uknown
-esac
-
 
 case $distro in
   arch) e ttf-dejavu ;;
@@ -199,12 +194,6 @@ case $distro in
     ;;
 esac
 
-case $distro in
-  fedora) cabal install shellcheck ;;
-  *) e shellcheck ;;
-  # unknown for older ubuntu
-esac
-
 case $distro in
   arch|debian|trisquel|ubuntu) e pumpa ;;
   # others unknown. do have a buildscript: