GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-03-16 03:41:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moving numix-icon theme back to main package list since its fixed with this commit b293f186fb (diff-cc2879263e4a73e37cf60f2fa6b3fb64) , etcher download rfc, minor fixes

Browse source
This commit is contained in:
Igor Pecovnik 2018-08-10 22:44:55 +02:00
parent 6c366ca122
commit f5f7a0836a
5 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config/sources/sun50iw1.conf
View file

@ -87,10 +87,9 @@ family_tweaks_s()
# enable services installed from BSP
chroot $SDCARD /bin/bash -c "systemctl --no-reload enable pinebook-bluetooth.service >/dev/null 2>&1"
fi
# power manager
[[ $BUILD_DESKTOP == yes && $BOARD == pinebook-a64 ]] && chroot $SDCARD /bin/bash -c "apt-get -qq -y install xfce4-power-manager bluetooth >/dev/null 2>&1"
fi
# power manager
[[ $BUILD_DESKTOP == yes && $BOARD == pinebook-a64 ]] && chroot $SDCARD /bin/bash -c "apt-get -qq -y install xfce4-power-manager bluetooth >/dev/null 2>&1"
}
family_tweaks_bsp()

6
lib/configuration.sh
View file

@ -135,7 +135,7 @@ PACKAGE_LIST_DESKTOP="xserver-xorg xserver-xorg-video-fbdev gvfs-backends gvfs-f
x11-xserver-utils xfce4 lxtask xfce4-terminal thunar-volman gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf \
libgtk2.0-bin libgnome2-perl network-manager-gnome xfce4-notifyd gnome-keyring gcr libgck-1-0 p11-kit pasystray pavucontrol \
pulseaudio pavumeter pulseaudio-module-gconf bluez bluez-tools pulseaudio-module-bluetooth blueman libpam-gnome-keyring \
libgl1-mesa-dri policykit-1 profile-sync-daemon gnome-orca numix-gtk-theme"
libgl1-mesa-dri policykit-1 profile-sync-daemon gnome-orca numix-gtk-theme numix-icon-theme"
# Recommended desktop packages
@ -164,13 +164,13 @@ case $RELEASE in
jessie)
PACKAGE_LIST_RELEASE="less kbd gnupg2 dirmngr"
PACKAGE_LIST_DESKTOP+=" paman libgcr-3-common gcj-jre-headless policykit-1-gnome eject numix-icon-theme"
PACKAGE_LIST_DESKTOP+=" paman libgcr-3-common gcj-jre-headless policykit-1-gnome eject"
PACKAGE_LIST_DESKTOP_RECOMMENDS+=" iceweasel pluma system-config-printer"
;;
xenial)
PACKAGE_LIST_RELEASE="man-db wget nano"
PACKAGE_LIST_DESKTOP+=" paman libgcr-3-common gcj-jre-headless paprefs numix-icon-theme"
PACKAGE_LIST_DESKTOP+=" paman libgcr-3-common gcj-jre-headless paprefs"
PACKAGE_LIST_DESKTOP_RECOMMENDS+=" chromium-browser language-selector-gnome system-config-printer-common system-config-printer-gnome"
;;

2
lib/debootstrap-ng.sh
View file

@ -521,7 +521,7 @@ create_image()
[[ $(type -t post_build_image) == function ]] && post_build_image "$DEST/images/${version}.img"
# write image to SD card
if [[ -e "$CARD_DEVICE" && -f $DEST/images/${version}.img ]]; then
if [[ -e "$CARD_DEVICE" && -f $DEST/images/${version}.img && $COMPRESS_OUTPUTIMAGE != yes ]]; then
display_alert "Writing image" "$CARD_DEVICE" "info"
etcher $DEST/images/${version}.img -d $CARD_DEVICE -y
if [ $? -eq 0 ]; then

6
lib/desktop.sh
View file

@ -85,12 +85,6 @@ create_desktop_package ()
mkdir -p $destination/etc/skel
cp -R $SRC/packages/blobs/desktop/skel/. $destination/etc/skel
# using different icon pack. Workaround due to this bug https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=867779
if [[ ${RELEASE} == bionic || ${RELEASE} == stretch ]]; then
sed -i 's/<property name="IconThemeName" type="string" value=".*$/<property name="IconThemeName" type="string" value="Humanity-Dark">/g' \
$destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
fi
# install dedicated startup icons
mkdir -p $destination/usr/share/pixmaps $destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/
cp $SRC/packages/blobs/desktop/icons/${DISTRIBUTION,,}.png $destination/usr/share/pixmaps

10
lib/general.sh
View file

@ -743,7 +743,9 @@ download_toolchain()
download_etcher_cli()
{
local url=$(curl -s https://api.github.com/repos/resin-io/etcher/releases | grep etcher-cli | grep linux-x64 | grep browser_download_url | head -1 | cut -d \" -f 4)
local url="https://github.com/resin-io/etcher/releases/download/v1.4.4/etcher-cli-1.4.4-linux-x64.tar.gz"
local hash="54709ad34ac304d2686130c7d22a3bc13b4f491387d987274eeca4f6eea34dce"
local filename=${url##*/}
local dirname=${filename/.tar.gz/-dist}
@ -759,13 +761,11 @@ download_etcher_cli()
curl -Lf --progress-bar $url -o $filename
local verified=false
local b=$(sha256sum $filename)
display_alert "Verifying"
local a=$(curl -sL $(curl -s https://api.github.com/repos/resin-io/etcher/releases | grep SHA | grep browser_download_url | head -1 | cut -d \" -f 4) | grep etcher-cli | grep linux-x64)
local b=$(sha256sum $filename)
[[ -n $a && -n $b && "$a" == "$b" ]] && verified=true
[[ "$hash" == "$(sha256sum $filename | cut -d ' ' -f 1)" ]] && verified=true
if [[ $verified == true ]]; then
display_alert "Extracting"