Commit 53b384c6 authored by arpinux's avatar arpinux
Browse files

improve build script + fix i386 UEFI pkgs / update wiki + fix ranger xdg-open launcher

parent 681842ee
......@@ -6,9 +6,10 @@ lb config noauto \
--apt-indices "false" \
--apt-recommends "false" \
--apt-source-archives "false" \
--archive-areas "main,contrib" \
--archive-areas "main contrib" \
--backports "true" \
--binary-image "iso-hybrid" \
--bootloaders "syslinux grub-efi" \
--clean \
--debian-installer "live" \
--debian-installer-gui "false" \
......
## nakeDeb UEFI packages -----------------------------------------------
efibootmgr mokutil shim-signed shim-signed-common shim-unsigned
#if ARCHITECTURES amd64
efibootmgr mokutil shim-signed shim-signed-common shim-unsigned
grub-efi-amd64 grub-efi-amd64-bin grub-efi-amd64-signed
shim-helpers-amd64-signed
grub-efi-amd64 grub-efi-amd64-bin
grub-efi-amd64-signed shim-helpers-amd64-signed
#endif
#if ARCHITECTURES i386
grub-efi-ia32 grub-efi-ia32-bin
grub-efi-ia32-signed shim-helpers-i386-signed
#endif
## eof ##---------------------------------------------------------------
......@@ -37,7 +37,7 @@ else
fi
# open log -------------------------------------------------------------
echo -e "${PROJECT} - ${HOMEPAGE} - ${CONTACT}" > ${LOG}
echo -e "----\n${PROJECT} - ${HOMEPAGE} - ${CONTACT}" > ${LOG}
echo -e "$(date)" >> ${LOG}
echo -e "building ${VERSION} ${ARCH} - live-build-$(lb -v) - Debian-${DEBV}" >> ${LOG}
if [ "$2" == "nf" ]; then
......@@ -46,7 +46,7 @@ fi
echo -e "$(uname -a)" >> ${LOG}
# setup veracrypt ------------------------------------------------------
echo -e "\nINFO: setting up veracrypt\n" >> ${LOG}
echo -e "----\nINFO: setting up veracrypt\n" >> ${LOG}
VERA="veracrypt_1.24-Update7"
mkdir -p config/includes.chroot
cp ${NKDIR}/ressources/veracrypt/${VERA}_${ARCH}.tar.gz ${NKDIR}/config/includes.chroot/
......@@ -64,7 +64,7 @@ EOF
# nonfree option hook --------------------------------------------------
if [ "$2" == "nf" ]; then
echo -e "\nINFO: setting up nonfree option hook\n" >> ${LOG}
echo -e "----\nINFO: setting up nonfree option hook\n" >> ${LOG}
cat <<EOF > ${NFHOOK}
#!/bin/sh
set -e
......@@ -84,12 +84,12 @@ else
fi
# setup preseed --------------------------------------------------------
echo -e "\nINFO: setting up naked preseed\n" >> ${LOG}
echo -e "----\nINFO: setting up naked preseed\n" >> ${LOG}
mkdir -p config/includes.chroot/usr/bin
install -m 755 ressources/nakedpreseed config/includes.chroot/usr/bin/nakedpreseed
# setup debs -----------------------------------------------------------
echo -e "\nINFO: building deb's\n" >> ${LOG}
echo -e "----\nINFO: building deb's\n" >> ${LOG}
mkdir -p config/packages
#cleaning
find pkgs -iname "*.deb" -exec rm {} \;
......@@ -97,15 +97,15 @@ find pkgs -iname "*.buildinfo" -exec rm -f {} \;
find pkgs -iname "*.changes" -exec rm -f {} \;
#building debs
for p in pkgs/*; do cd $p; ./mkdeb; cd ${NKDIR}; done | tee -a ${LOG}
echo -e "\nINFO: nakedpkgs lintian output\n" >> ${LOG}
echo -e "----\nINFO: nakedpkgs lintian output\n" >> ${LOG}
find pkgs -iname "*.deb" -exec lintian -q {} >> ${LOG} \;
find pkgs -iname "*.deb" -exec mv {} config/packages \;
# configure build ------------------------------------------------------
echo -e "\nINFO: configuration de ${VERSION}-${ARCH}\n" >> ${LOG}
echo -e "----\nINFO: configuration de ${VERSION}-${ARCH}\n" >> ${LOG}
# kernel/arch - bios/uefi options
case ${ARCH} in
i386) lb config -a "${ARCH}" | tee -a ${LOG};;
i386) lb config -a "${ARCH}" -k 686 | tee -a ${LOG};;
amd64) lb config -a "${ARCH}" | tee -a ${LOG};;
esac
# common config
......@@ -113,12 +113,12 @@ lb config --iso-volume "${VERSION}" --iso-application "${VERSION}" \
--iso-publisher "${PROJECT}; ${HOMEPAGE}; ${CONTACT}" | tee -a ${LOG}
# build ISO ------------------------------------------------------------
echo -e "\nINFO: construction de ${VERSION}-${ARCH}\n" >> ${LOG}
echo -e "----\nINFO: construction de ${VERSION}-${ARCH}\n" >> ${LOG}
lb build
# rename ---------------------------------------------------------------
if test -f live-image-${ARCH}.hybrid.iso; then
echo -e "\nINFO: renommer\n"
echo -e "----\nINFO: renommer\n"
ISODIR="${NKDIR}/nakedeb-${ARCH}"
if [ "$2" == "nf" ]; then
NAME="${VERSION}-${DEBV}-${ARCH}-nonfree"
......@@ -130,23 +130,23 @@ if test -f live-image-${ARCH}.hybrid.iso; then
mv chroot.packages.install ${ISODIR}/${NAME}.pkgs
mv ${LOG} ${ISODIR}/${NAME}.log
cd ${ISODIR}
echo -e "\nINFO: calculate md5sum\n"
echo -e "----\nINFO: calculate md5sum\n"
md5sum ${NAME}.iso > ${NAME}.md5
echo -e "\nINFO: make torrent\n"
echo -e "----\nINFO: make torrent\n"
cp ${NKDIR}/ressources/mkp2p ${ISODIR}
./mkp2p ${NAME}.iso
rm mkp2p
cd ${NKDIR}
echo -e "\nINFO: permissions\n"
echo -e "----\nINFO: permissions\n"
# !! adjust to your $USER !!
chown -R arp:arp ${ISODIR}
echo -e "\nINFO: nettoyage\n"
echo -e "----\nINFO: nettoyage\n"
echo -e "${RESET}" > ${VCHOOK}
echo -e "${RESET}" > ${NFHOOK}
lb clean
echo -e "\nbuild made in $(($SECONDS/60)) minutes\n"; exit 0
echo -e "----\nbuild made in $(($SECONDS/60)) minutes\n"; exit 0
else
chmod 666 ${LOG}
echo -e "\nISO not builded ... check your ${LOG} file !\n"; exit 1
echo -e "----\nERROR: ISO not builded ... check your ${LOG} file !\n"; exit 1
fi
# eof ------------------------------------------------------------------
......@@ -334,7 +334,7 @@ bar-load-gradient = false
type = internal/temperature
base-temperature = 60
warn-temperature = 80
hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon2/temp4_input
hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon5/temp4_input
format = <ramp>
format-warn = <ramp>
......
......@@ -290,7 +290,7 @@ label-padding = 1
type = internal/temperature
base-temperature = 60
warn-temperature = 80
hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon2/temp4_input
hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon5/temp4_input
format = <label>
format-warn = <label-warn>
......
......@@ -67,6 +67,9 @@ set vcs_backend_hg disabled
set vcs_backend_bzr disabled
set vcs_backend_svn disabled
# Truncate the long commit messages to this length when shown in the statusbar.
set vcs_msg_length 50
# Use one of the supported image preview protocols
set preview_images false
......@@ -106,12 +109,20 @@ set preview_images false
# while slower, this allows remote previews,
# for example during an ssh session.
# Tmux is unsupported.
set preview_images_method w3m
#
# * ueberzug:
# Preview images in full color with the external command "ueberzug".
# Images are shown by using a child window.
# Only for users who run X11 in GNU/Linux.
set preview_images_method urxvt
# Delay in seconds before displaying an image with the w3m method.
# Increase it in case of experiencing display corruption.
set w3m_delay 0.02
# Manually adjust the w3mimg offset when using a terminal which needs this
set w3m_offset 0
# Default iTerm2 font size (see: preview_images_method: iterm2)
set iterm2_font_width 8
set iterm2_font_height 11
......@@ -136,6 +147,9 @@ set preview_files true
set preview_directories true
set collapse_preview true
# Wrap long lines in plain text previews?
set wrap_plaintext_previews false
# Save the console history on exit?
set save_console_history true
......@@ -168,10 +182,10 @@ set display_free_space_in_status_bar true
# Display files tags in all columns or only in main column?
set display_tags_in_all_columns true
# Set a title for the window?
# Set a title for the window? Updates both `WM_NAME` and `WM_ICON_NAME`
set update_title false
# Set the title to "ranger" in the tmux program?
# Set the tmux/screen window-name to "ranger"?
set update_tmux_title true
# Shorten the title if it gets long? The number defines how many
......@@ -290,6 +304,14 @@ set global_inode_type_filter
# should be 'false' during start-up, but you can toggle it by pressing F.
set freeze_files false
# Print file sizes in bytes instead of the default human-readable format.
set size_in_bytes false
# Warn at startup if RANGER_LEVEL env var is greater than 0, in other words
# give a warning when you nest ranger in a subshell started by ranger.
# Special value "error" makes the warning more visible.
set nested_ranger_warning true
# ===================================================================
# == Local Options
# ===================================================================
......@@ -337,6 +359,8 @@ map <esc> change_mode normal
map ~ set viewmode!
map i display_file
map <A-j> scroll_preview 1
map <A-k> scroll_preview -1
map ? help
map W display_log
map w taskview_open
......@@ -348,7 +372,7 @@ map ! console shell%space
map @ console -p6 shell %%s
map # console shell -p%space
map s console shell%space
map r chain draw_possible_programs; console open_with%%space
map r chain draw_possible_programs; console open_with%space
map f console find%space
map cd console cd%space
......@@ -358,8 +382,10 @@ map <C-p> chain console; eval fm.ui.console.history_move(-1)
map Mf linemode filename
map Mi linemode fileinfo
map Mm linemode mtime
map Mh linemode humanreadablemtime
map Mp linemode permissions
map Ms linemode sizemtime
map MH linemode sizehumanreadablemtime
map Mt linemode metatitle
# Tagging / Marking
......@@ -381,6 +407,7 @@ map <F5> copy
map <F6> cut
map <F7> console mkdir%space
map <F8> console delete
#map <F8> console trash
map <F10> exit
# In case you work on a keyboard with dvorak layout
......@@ -463,8 +490,12 @@ map pl paste_symlink relative=False
map pL paste_symlink relative=True
map phl paste_hardlink
map pht paste_hardlinked_subtree
map pd console paste dest=
map p`<any> paste dest=%any_path
map p'<any> paste dest=%any_path
map dD console delete
map dT console trash
map dd cut
map ud uncut
......@@ -565,15 +596,18 @@ map zf console filter%space
copymap zf zz
# Filter stack
map .n console filter_stack add name%space
map .m console filter_stack add mime%space
map .d filter_stack add type d
map .f filter_stack add type f
map .l filter_stack add type l
map .m console filter_stack add mime%space
map .n console filter_stack add name%space
map .# console filter_stack add hash%space
map ." filter_stack add duplicate
map .' filter_stack add unique
map .| filter_stack add or
map .& filter_stack add and
map .! filter_stack add not
map .r console filter_stack rotate
map .r filter_stack rotate
map .c filter_stack clear
map .* filter_stack decompose
map .p filter_stack pop
......
......@@ -26,7 +26,7 @@
# directory | $1 is a directory
# number <n> | change the number of this command to n
# terminal | stdin, stderr and stdout are connected to a terminal
# X | $DISPLAY is not empty (i.e. Xorg runs)
# X | A graphical environment is available (darwin, Xorg, or Wayland)
#
# There are also pseudo-conditions which have a "side effect":
# flag <flags> | Change how the program is run. See below.
......@@ -66,13 +66,13 @@ ext x?html?, has uzbl-tabbed, X, flag f = uzbl-tabbed -- "$@"
ext x?html?, has uzbl-browser, X, flag f = uzbl-browser -- "$@"
ext x?html?, has uzbl-core, X, flag f = uzbl-core -- "$@"
ext x?html?, has midori, X, flag f = midori -- "$@"
ext x?html?, has chromium-browser, X, flag f = chromium-browser -- "$@"
ext x?html?, has chromium, X, flag f = chromium -- "$@"
ext x?html?, has google-chrome, X, flag f = google-chrome -- "$@"
ext x?html?, has opera, X, flag f = opera -- "$@"
ext x?html?, has firefox, X, flag f = firefox -- "$@"
ext x?html?, has seamonkey, X, flag f = seamonkey -- "$@"
ext x?html?, has iceweasel, X, flag f = iceweasel -- "$@"
ext x?html?, has chromium-browser, X, flag f = chromium-browser -- "$@"
ext x?html?, has chromium, X, flag f = chromium -- "$@"
ext x?html?, has google-chrome, X, flag f = google-chrome -- "$@"
ext x?html?, has epiphany, X, flag f = epiphany -- "$@"
ext x?html?, has konqueror, X, flag f = konqueror -- "$@"
ext x?html?, has elinks, terminal = elinks "$@"
......@@ -99,7 +99,7 @@ ext exe = wine "$1"
name ^[mM]akefile$ = make
#--------------------------------------------
# Code
# Scripts
#-------------------------------------------
ext py = python3 -- "$1"
ext pl = perl -- "$1"
......@@ -132,7 +132,7 @@ mime ^video|audio, has totem, X, flag f = totem -- "$@"
mime ^video|audio, has totem, X, flag f = totem --fullscreen -- "$@"
#--------------------------------------------
# Video without X:
# Video without X
#-------------------------------------------
mime ^video, terminal, !X, has mpv = mpv -- "$@"
mime ^video, terminal, !X, has mplayer2 = mplayer2 -- "$@"
......@@ -141,7 +141,6 @@ mime ^video, terminal, !X, has mplayer = mplayer -- "$@"
#-------------------------------------------
# Documents
#-------------------------------------------
ext pdf, has katarakt, X, flag f = katarakt "$@"
ext pdf, has llpp, X, flag f = llpp "$@"
ext pdf, has zathura, X, flag f = zathura -- "$@"
ext pdf, has mupdf, X, flag f = mupdf "$@"
......@@ -169,19 +168,23 @@ ext djvu, has atril, X, flag f = atril -- "$@"
ext djvu, has djview, X, flag f = djview -- "$@"
ext epub, has ebook-viewer, X, flag f = ebook-viewer -- "$@"
ext epub, has zathura, X, flag f = zathura -- "$@"
ext epub, has mupdf, X, flag f = mupdf -- "$@"
ext mobi, has ebook-viewer, X, flag f = ebook-viewer -- "$@"
ext cbr, has zathura, X, flag f = zathura -- "$@"
ext cbz, has zathura, X, flag f = zathura -- "$@"
#-------------------------------------------
# Image Viewing:
# Images
#-------------------------------------------
mime ^image/svg, has cyclope, X, flag f = cyclope -- "$@"
mime ^image/svg, has inkscape, X, flag f = inkscape -- "$@"
mime ^image/svg, has display, X, flag f = display -- "$@"
mime ^image, has cyclope, X, flag f = cyclope -- "$@"
mime ^image, has imv, X, flag f = imv -- "$@"
mime ^image, has pqiv, X, flag f = pqiv -- "$@"
mime ^image, has sxiv, X, flag f = sxiv -- "$@"
mime ^image, has gthumb, X, flag f = gthumb -- "$@"
mime ^image, has feh, X, flag f = feh -- "$@"
mime ^image, has mirage, X, flag f = mirage -- "$@"
mime ^image, has ristretto, X, flag f = ristretto "$@"
......@@ -189,11 +192,17 @@ mime ^image, has eog, X, flag f = eog -- "$@"
mime ^image, has eom, X, flag f = eom -- "$@"
mime ^image, has nomacs, X, flag f = nomacs -- "$@"
mime ^image, has geeqie, X, flag f = geeqie -- "$@"
mime ^image, has gpicview, X, flag f = gpicview -- "$@"
mime ^image, has gwenview, X, flag f = gwenview -- "$@"
mime ^image, has gthumb , X, flag f = gthumb -- "$@"
mime ^image, has gimp, X, flag f = gimp -- "$@"
ext xcf, X, flag f = gimp -- "$@"
#-------------------------------------------
# Image in archives
#-------------------------------------------
ext cbz|cbr, has mcomix, X, flag f = mcomix -- "$@"
#-------------------------------------------
# Archives
#-------------------------------------------
......@@ -205,9 +214,6 @@ ext ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz, has atool = atool --list --
ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has atool = atool --list --each -- "$@" | "$PAGER"
ext 7z|ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz, has atool = atool --extract --each -- "$@"
ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has atool = atool --extract --each -- "$@"
# This requires file-roller
ext 7z|ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz, has file-roller, X, flag f = file-roller -- "$@"
ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has file-roller, X, flag f = file-roller -- "$@"
# Listing and extracting archives without atool:
ext tar|gz|bz2|xz, has tar = tar vvtf "$1" | "$PAGER"
......@@ -220,6 +226,11 @@ ext ace, has unace = for file in "$@"; do unace e "$file"; done
ext rar, has unrar = unrar l "$1" | "$PAGER"
ext rar, has unrar = for file in "$@"; do unrar x "$file"; done
#-------------------------------------------
# Fonts
#-------------------------------------------
mime ^font, has fontforge, X, flag f = fontforge "$@"
#-------------------------------------------
# Flag t fallback terminals
#-------------------------------------------
......@@ -256,10 +267,26 @@ label wallpaper, number 12, mime ^image, has feh, X = feh --bg-tile "$1"
label wallpaper, number 13, mime ^image, has feh, X = feh --bg-center "$1"
label wallpaper, number 14, mime ^image, has feh, X = feh --bg-fill "$1"
#-------------------------------------------
# Generic file openers
#-------------------------------------------
label open, has xdg-open = xdg-open "$@"
label open, has open = open -- "$@"
# Define the editor for non-text files + pager as last action
!mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php = ask
label editor, !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php = ${VISUAL:-$EDITOR} -- "$@"
label pager, !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php = "$PAGER" -- "$@"
# The very last action, so that it's never triggered accidentally, is to execute a program:
######################################################################
# The actions below are left so low down in this file on purpose, so #
# they are never triggered accidentally. #
######################################################################
# Execute a file as program/script.
mime application/x-executable = "$1"
# Move the file to trash using trash-cli.
label trash, has trash-put = trash-put -- "$@"
label trash = mkdir -p -- ${XDG_DATA_DIR:-$HOME/.ranger}/ranger-trash; mv -- "$@" ${XDG_DATA_DIR:-$HOME/.ranger}/ranger-trash
......@@ -722,9 +722,7 @@ EndSection</code></pre>
<a name="uefi"></a>
<h2>uefi / secure boot</h2>
<p>nakeDeb is built with live-build, the Debian tool compatible with the uefi boot.<br />
note however that the 'i386' version (for old 32bits machines) is not UEFI compatible.</p>
<p>nakeDeb is built with live-build, the Debian tool compatible with uefi &amp; secure boot for both amd64 &amp; i386 releases.</p>
</div>
<div id="totop"><a href="#header">&uarr;</a></div>
......
......@@ -747,9 +747,7 @@ EndSection</code></pre>
<a name="uefi"></a>
<h2>uefi / secure boot</h2>
<p>nakeDeb est construit avec live-build, l'outil Debian compatible avec le boot uefi.<br />
notez cependant que la version 'i386' (pour les vieilles machines en 32bits) n'est pas compatible UEFI.</p>
<p>nakeDeb est construit avec live-build, l'outil Debian compatible avec l'UEFI et le secure boot.</p>
</div>
<div id="totop"><a href="#header">&uarr;</a></div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment