install_base/install_base.customsteps.sh

@@ -1,4 +1,4 @@
 apt install -y \
-  transmission \
-  audacious \
+	transmission \
+	audacious \
   vlc \

install_base/install_base.sh

@@ -55,89 +55,89 @@ apt update || error
 message "install nanodesk minimal base packages (apt install --no-install-recommends)"
 #apt install -y \
 apt install -y --no-install-recommends \
-  linux-image-amd64 \
-  firmware-linux \
-  firmware-linux-nonfree \
-  firmware-zd1211 firmware-ti-connectivity firmware-realtek-rtl8723cs-bt \
-  firmware-realtek firmware-netxen firmware-netronome firmware-myricom \
-  firmware-libertas firmware-iwlwifi \
-  firmware-intel-sound firmware-cavium firmware-brcm80211 firmware-bnx2x \
-  firmware-bnx2 firmware-atheros firmware-ath9k-htc \
-  live-boot \
-  dialog \
-  sudo \
-  console-data \
+	linux-image-amd64 \
+	firmware-linux \
+	firmware-linux-nonfree \
+	firmware-zd1211 firmware-ti-connectivity firmware-realtek-rtl8723cs-bt \
+	firmware-realtek firmware-netxen firmware-netronome firmware-myricom \
+	firmware-libertas firmware-iwlwifi \
+	firmware-intel-sound firmware-cavium firmware-brcm80211 firmware-bnx2x \
+	firmware-bnx2 firmware-atheros firmware-ath9k-htc \
+	live-boot \
+	dialog \
+	sudo \
+	console-data \
   bash-completion \
-  locales \
-  man \
-  unzip \
-  zip \
-  bzip2 \
-  zstd \
-  grub-pc \
-  host \
-  wireless-tools \
-  unrar \
-  p7zip-full \
-  xz-utils \
-  wpagui \
-  xserver-xorg \
-  xscreensaver \
-  xfonts-75dpi \
-  xfonts-100dpi \
+	locales \
+	man \
+	unzip \
+	zip \
+	bzip2 \
+	zstd \
+	grub-pc \
+	host \
+	wireless-tools \
+	unrar \
+	p7zip-full \
+	xz-utils \
+	wpagui \
+	xserver-xorg \
+	xscreensaver \
+	xfonts-75dpi \
+	xfonts-100dpi \
   fonts-noto-color-emoji \
-  x11-apps \
-  x11-utils \
-  xdg-utils \
+	x11-apps \
+	x11-utils \
+	xdg-utils \
   xdg-user-dirs \
-  xterm \
-  xdm \
-  jwm \
-  mc \
-  wget \
-  curl \
-  less \
+	xterm \
+	xdm \
+	jwm \
+	mc \
+	wget \
+	curl \
+	less \
   openssh-client \
-  rsync \
-  vim \
-  links2 \
-  ncdu \
-  htop \
-  git \
+	rsync \
+	vim \
+	links2 \
+	ncdu \
+	htop \
+	git \
   telnet \
   netcat-traditional \
-  gxmessage \
-  gsimplecal \
-  alsa-utils \
-  volumeicon-alsa \
-  arandr \
-  xfe \
-  xarchiver \
+	gxmessage \
+	gsimplecal \
+	alsa-utils \
+	volumeicon-alsa \
+	arandr \
+	xfe \
+	xarchiver \
   qpdfview \
-  lxterminal \
+	lxterminal \
   lxpolkit \
-  gparted \
-  dillo \
-  falkon \
+	gparted \
+	dillo \
+	falkon \
   gtk2-engines \
   gnome-themes-extra \
   squashfs-tools \
   synaptic \
-  /tmp/xdgmenumaker*.deb || error
+	/tmp/xdgmenumaker*.deb || error
 
 message "install nanodesk base packages with recommends"
 apt install -y \
-  grub-pc \
+	grub-pc \
   connman \
   connman-ui \
   connman-gtk \
   connman-vpn \
-  net-tools \
-  isc-dhcp-client \
-  host \
-  wireless-tools \
-  gvfs-common \
-  pcmanfm \
+	net-tools \
+	isc-dhcp-client \
+	host \
+	wireless-tools \
+	gvfs-common \
+	pcmanfm \
 
 
 #message "install linux-kernel from backports"

makeanything.sh

@@ -122,10 +122,6 @@ sudo cp build/tmp/jwm.iconlist build/chroot/tmp/ || error
 message "putting generated icon path list to /etc/jwm/system.nanodesk.jwmrc"
 $CHROOTCMD sed -i '/<\!-- GENERATED ICONLIST -->/r /tmp/jwm.iconlist' /etc/jwm/system.nanodesk.jwmrc || error
 
-message "workaround missing multimedia icon in menu"
-$CHROOTCMD sed -i 's/^Icon=.*$/Icon=\/usr\/share\/icons\/nuoveXT2\/32x32\/categories\/applications-multimedia\.png/g' /usr/share/desktop-directories/xdgmenumaker-multimedia.directory || error
-
-
 message "correct file permissions"
 #$CHROOTCMD /usr/bin/chmod 440 /etc/sudoers || error
 $CHROOTCMD /usr/bin/chmod 755 /usr/sbin/nanodesk-installer || error