OSDN Git Service

Merge branch 'dev' into dev-stable
authorhayao <shun819.mail@gmail.com>
Tue, 5 May 2020 00:08:48 +0000 (09:08 +0900)
committerhayao <shun819.mail@gmail.com>
Tue, 5 May 2020 00:08:48 +0000 (09:08 +0900)
18 files changed:
build.sh
channels/lxde/airootfs.any/etc/skel/.bash_profile
channels/lxde/airootfs.any/etc/skel/.setup.sh
channels/lxde/airootfs.any/etc/skel/.zprofile
channels/lxde/airootfs.i686/etc/lightdm/slick-greeter.conf [new file with mode: 0644]
channels/lxde/airootfs.i686/etc/skel/.config/lxpanel/LXDE/panels/panel [new file with mode: 0644]
channels/lxde/airootfs.i686/etc/skel/.config/lxpanel/LXDE/panels/panel-jp [new file with mode: 0644]
channels/lxde/airootfs.x86_64/etc/lightdm/lightdm-webkit2-greeter.conf [moved from channels/lxde/airootfs.any/etc/lightdm/lightdm-webkit2-greeter.conf with 100% similarity]
channels/lxde/airootfs.x86_64/etc/skel/.config/lxpanel/LXDE/panels/panel [moved from channels/lxde/airootfs.any/etc/skel/.config/lxpanel/LXDE/panels/panel with 100% similarity]
channels/lxde/airootfs.x86_64/etc/skel/.config/lxpanel/LXDE/panels/panel-jp [moved from channels/lxde/airootfs.any/etc/skel/.config/lxpanel/LXDE/panels/panel-jp with 100% similarity]
channels/lxde/packages.i686/lightdm.i686
channels/lxde/packages.i686/lxde.i686
channels/lxde/packages.x86_64/lxde.x86_64
channels/xfce/airootfs.i686/etc/lightdm/slick-greeter.conf [new file with mode: 0644]
channels/xfce/airootfs.x86_64/etc/lightdm/lightdm-webkit2-greeter.conf [moved from channels/xfce/airootfs.any/etc/lightdm/lightdm-webkit2-greeter.conf with 100% similarity]
channels/xfce/packages.i686/lightdm.i686
docs/README.md
docs/README_jp.md

index 95de300..c4960c1 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -506,7 +506,7 @@ prepare_build() {
         }
     fi
 
-    # Load kernel module
+    # Load loop kernel module
     if [[ -z $(lsmod | awk '{print $1}' | grep -x "loop") ]]; then
         sudo modprobe loop
     fi
@@ -688,9 +688,9 @@ make_packages() {
         set -e
     }
 
-    installpkglist    
+    installpkglist
 
-    # echo ${pkglist[@]}
+    # _msg_debug "${pkglist[@]}"
 
     # Create a list of packages to be finally installed as packages.list directly under the working directory.
     echo "# The list of packages that is installed in live cd." > ${work_dir}/packages.list
@@ -757,6 +757,7 @@ make_customize_airootfs() {
     fi
     curl -o "${work_dir}/${arch}/airootfs/etc/pacman.d/mirrorlist" "${mirrorlisturl}"
 
+    # Add install guide to /root (disabled)
     # lynx -dump -nolist 'https://wiki.archlinux.org/index.php/Installation_Guide?action=render' >> ${work_dir}/${arch}/airootfs/root/install.txt
 
 
index 1bf2f71..68f63c1 100755 (executable)
@@ -3,7 +3,7 @@
 #
 
 [[ -f ~/.bashrc ]] && . ~/.bashrc
-[[ -f ~/.setup.sh ]] && ~/.setup.sh
+[[ -f ~/.setup.sh ]] && bash ~/.setup.sh
 if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
   exec startx
 fi
\ No newline at end of file
index 44abfb3..50ef2d3 100755 (executable)
@@ -14,18 +14,16 @@ function remove () {
 }
 
 
-mkdir -p ${HOME}/.config/gtk-3.0/
-touch ${HOME}/.config/gtk-3.0/bookmarks
+touch ${HOME}/.gtk-bookmarks
 
 source ${HOME}/.config/user-dirs.dirs
 
 cat > "${HOME}/.config/gtk-3.0/bookmarks" << EOF
-file://${XDG_DOCUMENTS_DIR}/
-file://${XDG_DOWNLOAD_DIR}/
-file://${XDG_MUSIC_DIR}/
-file://${XDG_PICTURES_DIR}
-file://${XDG_TEMPLATES_DIR}
-file://${XDG_VIDEOS_DIR}
+file://${XDG_DOCUMENTS_DIR} Documents
+file://${XDG_DOWNLOAD_DIR} Downloads
+file://${XDG_MUSIC_DIR} Music
+file://${XDG_PICTURES_DIR} Pictures
+file://${XDG_VIDEOS_DIR} Videos
 EOF
 
 remove ~/.config/autostart/gensidebar.desktop
index 484873e..0414776 100755 (executable)
@@ -2,7 +2,7 @@
 # ~/.zsh_profile
 #
 
-[[ -f ~/.setup.sh ]] && ~/.setup.sh
+[[ -f ~/.setup.sh ]] && bash ~/.setup.sh
 if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
   exec startx
 fi
diff --git a/channels/lxde/airootfs.i686/etc/lightdm/slick-greeter.conf b/channels/lxde/airootfs.i686/etc/lightdm/slick-greeter.conf
new file mode 100644 (file)
index 0000000..7bcb964
--- /dev/null
@@ -0,0 +1,5 @@
+[Greeter]
+draw-user-backgrounds=false
+background=/usr/share/backgrounds/alter.png
+theme-name=Adapta-Nokto-Eta
+icon-theme-name=Papirus-Dark
diff --git a/channels/lxde/airootfs.i686/etc/skel/.config/lxpanel/LXDE/panels/panel b/channels/lxde/airootfs.i686/etc/skel/.config/lxpanel/LXDE/panels/panel
new file mode 100644 (file)
index 0000000..5cf4441
--- /dev/null
@@ -0,0 +1,140 @@
+# lxpanel <profile> config file. Manually editing is not recommended.
+# Use preference dialog in lxpanel to adjust config when you can.
+
+Global {
+  edge=bottom
+  align=left
+  margin=0
+  widthtype=percent
+  width=100
+  height=34
+  transparent=0
+  tintcolor=#000000
+  alpha=0
+  setdocktype=1
+  setpartialstrut=1
+  autohide=0
+  heightwhenhidden=0
+  usefontcolor=0
+  fontcolor=#ffffff
+  background=0
+  backgroundfile=/usr/share/lxpanel/images/background.png
+  iconsize=27
+}
+Plugin {
+  type=space
+  Config {
+    Size=5
+  }
+}
+Plugin {
+  type=menu
+  Config {
+    image=/usr/share/icons/hicolor/36x36/apps/alter.png
+    system {
+    }
+    separator {
+    }
+    item {
+      command=run
+    }
+    separator {
+    }
+    item {
+      image=gnome-logout
+      command=logout
+    }
+  }
+}
+Plugin {
+  type=space
+  Config {
+    Size=7
+  }
+}
+Plugin {
+  type=launchbar
+  Config {
+    Button {
+      id=firefox.desktop
+    }
+    Button {
+      id=pcmanfm.desktop
+    }
+    Button {
+      id=lxterminal.desktop
+    }
+    Button {
+      id=lxtask.desktop
+    }
+    Button {
+      id=org.gnome.Screenshot.desktop
+    }
+  }
+}
+Plugin {
+  type=space
+  Config {
+    Size=20
+  }
+}
+Plugin {
+  type=taskbar
+  expand=1
+  Config {
+    tooltips=-1
+    IconsOnly=-1
+    AcceptSkipPager=1
+    ShowIconified=1
+    ShowMapped=1
+    ShowAllDesks=0
+    UseMouseWheel=0
+    UseUrgencyHint=1
+    FlatButton=-1
+    MaxTaskWidth=50
+    spacing=1
+    SameMonitorOnly=-1
+    GroupedTasks=0
+  }
+}
+Plugin {
+  type=pager
+  Config {
+  }
+}
+Plugin {
+  type=xkb
+  Config {
+    Model=pc105
+    LayoutsList=us
+    VariantsList=,
+    ToggleOpt=grp:shift_caps_toggle
+    DisplayType=0
+    KeepSysLayouts=0
+    NoResetOpt=0
+    FlagSize=1
+  }
+}
+Plugin {
+  type=volume
+  Config {
+    VolumeMuteKey=XF86AudioMute
+    VolumeDownKey=XF86AudioLowerVolume
+    VolumeUpKey=XF86AudioRaiseVolume
+  }
+}
+Plugin {
+  type=tray
+  Config {
+  }
+}
+Plugin {
+  type=dclock
+  Config {
+    ClockFmt=%R
+    TooltipFmt=%A %x
+    BoldFont=0
+    IconOnly=0
+    CenterText=0
+  }
+}
diff --git a/channels/lxde/airootfs.i686/etc/skel/.config/lxpanel/LXDE/panels/panel-jp b/channels/lxde/airootfs.i686/etc/skel/.config/lxpanel/LXDE/panels/panel-jp
new file mode 100644 (file)
index 0000000..b43af44
--- /dev/null
@@ -0,0 +1,127 @@
+# lxpanel <profile> config file. Manually editing is not recommended.
+# Use preference dialog in lxpanel to adjust config when you can.
+
+Global {
+  edge=bottom
+  align=left
+  margin=0
+  widthtype=percent
+  width=100
+  height=34
+  transparent=0
+  tintcolor=#000000
+  alpha=0
+  setdocktype=1
+  setpartialstrut=1
+  autohide=0
+  heightwhenhidden=0
+  usefontcolor=0
+  fontcolor=#ffffff
+  background=0
+  backgroundfile=/usr/share/lxpanel/images/background.png
+  iconsize=27
+}
+Plugin {
+  type=space
+  Config {
+    Size=5
+  }
+}
+Plugin {
+  type=menu
+  Config {
+    image=/usr/share/icons/hicolor/36x36/apps/alter.png
+    system {
+    }
+    separator {
+    }
+    item {
+      command=run
+    }
+    separator {
+    }
+    item {
+      image=gnome-logout
+      command=logout
+    }
+  }
+}
+Plugin {
+  type=space
+  Config {
+    Size=7
+  }
+}
+Plugin {
+  type=launchbar
+  Config {
+    Button {
+      id=firefox.desktop
+    }
+    Button {
+      id=pcmanfm.desktop
+    }
+    Button {
+      id=lxterminal.desktop
+    }
+    Button {
+      id=lxtask.desktop
+    }
+    Button {
+      id=org.gnome.Screenshot.desktop
+    }
+  }
+}
+Plugin {
+  type=space
+  Config {
+    Size=20
+  }
+}
+Plugin {
+  type=taskbar
+  expand=1
+  Config {
+    tooltips=-1
+    IconsOnly=-1
+    AcceptSkipPager=1
+    ShowIconified=1
+    ShowMapped=1
+    ShowAllDesks=0
+    UseMouseWheel=0
+    UseUrgencyHint=1
+    FlatButton=-1
+    MaxTaskWidth=50
+    spacing=1
+    SameMonitorOnly=-1
+    GroupedTasks=0
+  }
+}
+Plugin {
+  type=pager
+  Config {
+  }
+}
+Plugin {
+  type=volume
+  Config {
+    VolumeMuteKey=XF86AudioMute
+    VolumeDownKey=XF86AudioLowerVolume
+    VolumeUpKey=XF86AudioRaiseVolume
+  }
+}
+Plugin {
+  type=tray
+  Config {
+  }
+}
+Plugin {
+  type=dclock
+  Config {
+    ClockFmt=%R
+    TooltipFmt=%A %x
+    BoldFont=0
+    IconOnly=0
+    CenterText=0
+  }
+}
index f02e07e..431c22e 100644 (file)
@@ -11,8 +11,8 @@
 
 
 lightdm
-lightdm-webkit2-greeter
-lightdm-webkit2-theme-alter
+lightdm-webkit2-greeter
+lightdm-webkit2-theme-alter
 # lightdm-gtk-greeter
-lightdm-slick-greeter
-lightdm-settings
\ No newline at end of file
+lightdm-slick-greeter
+lightdm-settings
\ No newline at end of file
index 06b742b..9bf1210 100644 (file)
@@ -16,7 +16,7 @@ lxappearance
 lxappearance-obconf
 lxde-common
 lxde-icon-theme
-lxdm
+# lxdm     LightDMで代用
 lxhotkey
 lxinput
 lxlauncher
index 06b742b..9bf1210 100644 (file)
@@ -16,7 +16,7 @@ lxappearance
 lxappearance-obconf
 lxde-common
 lxde-icon-theme
-lxdm
+# lxdm     LightDMで代用
 lxhotkey
 lxinput
 lxlauncher
diff --git a/channels/xfce/airootfs.i686/etc/lightdm/slick-greeter.conf b/channels/xfce/airootfs.i686/etc/lightdm/slick-greeter.conf
new file mode 100644 (file)
index 0000000..7bcb964
--- /dev/null
@@ -0,0 +1,5 @@
+[Greeter]
+draw-user-backgrounds=false
+background=/usr/share/backgrounds/alter.png
+theme-name=Adapta-Nokto-Eta
+icon-theme-name=Papirus-Dark
index f02e07e..431c22e 100644 (file)
@@ -11,8 +11,8 @@
 
 
 lightdm
-lightdm-webkit2-greeter
-lightdm-webkit2-theme-alter
+lightdm-webkit2-greeter
+lightdm-webkit2-theme-alter
 # lightdm-gtk-greeter
-lightdm-slick-greeter
-lightdm-settings
\ No newline at end of file
+lightdm-slick-greeter
+lightdm-settings
\ No newline at end of file
index c300908..38d25e8 100644 (file)
@@ -83,6 +83,9 @@ These are a list of major branches. Other branches are temporary or used for spe
                        <th>
                                <a href="https://github.com/SereneTeam/alterlinux/tree/master">master</a>
                        </th>
+                       <th>    
+                               <a href="https://github.com/SereneTeam/alterlinux/tree/stable">stable</a>
+                       </th>
                        <th>
                                <a href="https://github.com/SereneTeam/alterlinux/tree/dev-stable">dev-stable</a>
                        </th>
@@ -97,7 +100,10 @@ These are a list of major branches. Other branches are temporary or used for spe
                                Most stable. Bug fixes may be delayed.
                        </td>
                        <td>
-                           It is updated regularly. Relatively stable, with the latest features and fixes.     
+                               Release candidate. Most bugs have been fixed.
+                       </td>
+                       <td>
+                           It is updated regularly. Relatively stable, with the latest features and fixes. *
                        </td>
                        <td>
                                Always updated. There may be many issues left.
index a4823e6..13afebc 100644 (file)
@@ -80,6 +80,9 @@ AlterLinuxの最新の開発状況は<a href="https://github.com/orgs/FascodeNet
                        <th>
                                <a href="https://github.com/SereneTeam/alterlinux/tree/master">master</a>
                        </th>
+                       <th>    
+                               <a href="https://github.com/SereneTeam/alterlinux/tree/stable">stable</a>
+                       </th>
                        <th>
                                <a href="https://github.com/SereneTeam/alterlinux/tree/dev-stable">dev-stable</a>
                        </th>
@@ -94,7 +97,10 @@ AlterLinuxの最新の開発状況は<a href="https://github.com/orgs/FascodeNet
                                最も安定しています。バグの修正などは遅れる場合があります。
                        </td>
                        <td>
-                               定期的に更新されます。比較的安定していて、最新の機能や修正を利用できます。
+                               リリース候補です。ほとんどのバグが修正されています。
+                       </td>
+                       <td>
+                               定期的に更新されます。比較的安定していて、最新の機能や修正を利用できます。*
                        </td>
                        <td>
                                常に更新されます。問題が多数残っている場合があります。