Merge pull request #167 from t-koba/alpha

Modify: SUSH and BASH version values / cargo fmt

Author: ryuichiueda

.sushrc

@@ -7,7 +7,7 @@ case "$TERM" in
     xterm-color|*-256color) color_prompt=yes;;
 esac
 
-build_profile=$([[ "$BASH_VERSION" == *-release ]] || echo "(${BASH_VERSION##*-})")
+build_profile=$([[ "$SUSH_VERSION" == *-release ]] || echo "(${SUSH_VERSION##*-})")
 if [ "$color_prompt" = yes ]; then
 	PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;36m\]\b\[\033[00m\]\[\033[01;35m\]\w\[\033[00m\]'$build_profile'🍣 '
 else

Cargo.toml

@@ -5,6 +5,9 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[package.metadata.compat]
+target_bash_version = "5.2.37" # Ubuntu 25.04
+
 [dependencies]
 nix = { version = "0.29.0", features = ["fs", "process", "signal", "term", "user", "time", "hostname", "resource"]}
 termion = "4.0.5"
@@ -60,6 +63,8 @@ default = ["0", "1", "2", "3", "4", "5", "6"]               # All
 5 = ["0", "lang_hi", "lang_ja", "lang_ko", "lang_zh"]       # Asia
 6 = ["0", "lang_ar", "lang_sw"]                             # Africa / Middle East
 
+[build-dependencies]
+cargo_toml = "0.22"
 
 [profile.release]
 opt-level = 3

build.rs

@@ -1,19 +1,42 @@
 //SPDX-FileCopyrightText: 2024 @caro@mi.shellgei.org
 //SPDX-License-Identifier: BSD-3-Clause
 
-use std::env;
+use cargo_toml::Manifest;
+use std::{env, path::PathBuf};
 
 fn main() {
-    // BASH_VERSION, BASH_VERSINFO[4]
+    // SUSH_VERSION, SUSH_VERSINFO[4]
     let profile = env::var("PROFILE").unwrap_or("".to_string());
     println!("cargo:rustc-env=CARGO_BUILD_PROFILE={profile}");
-    // HOSTTYPE, MACHTYPE, BASH_VERSINFO[5]
+    // HOSTTYPE, MACHTYPE, BASH_VERSINFO[5], SUSH_VERSINFO[5]
     let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap_or("unknown".to_string());
     println!("cargo:rustc-env=CARGO_CFG_TARGET_ARCH={target_arch}");
-    // MACHTYPE, BASH_VERSINFO[5]
+    // MACHTYPE, BASH_VERSINFO[5], SUSH_VERSINFO[5]
     let target_vendor = env::var("CARGO_CFG_TARGET_VENDOR").unwrap_or("unknown".to_string());
     println!("cargo:rustc-env=CARGO_CFG_TARGET_VENDOR={target_vendor}");
-    // OSTYPE, MACHTYPE, BASH_VERSINFO[5]
+    // OSTYPE, MACHTYPE, BASH_VERSINFO[5], SUSH_VERSINFO[5]
     let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap_or("unknown".to_string());
     println!("cargo:rustc-env=CARGO_CFG_TARGET_OS={target_os}");
+
+    // metadata
+    let manifest_path = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()).join("Cargo.toml");
+    let manifest = Manifest::from_path(&manifest_path).expect("failed to parse Cargo.toml");
+    // compat
+    let compat = manifest
+        .package
+        .as_ref()
+        .and_then(|p| p.metadata.as_ref()?.get("compat"))
+        .and_then(|v| v.as_table())
+        .expect("Missing [package.metadata.compat]");
+    for (k, v) in compat {
+        let env_key: String = k
+            .chars()
+            .map(|c| if c.is_ascii_alphanumeric() { c } else { '_' })
+            .collect::<String>()
+            .to_ascii_uppercase();
+        let val = v
+            .as_str()
+            .unwrap_or_else(|| panic!("Non-string value for key {k} in [package.metadata.compat]"));
+        println!("cargo:rustc-env=COMPAT_{env_key}={val}");
+    }
 }

src/core.rs

@@ -164,22 +164,41 @@ impl ShellCore {
         let t_os = env!("CARGO_CFG_TARGET_OS");
         let machtype = format!("{t_arch}-{t_vendor}-{t_os}");
         let symbol = "rusty_bash";
+        let t_bash_symbol = "bash_compatible";
+        let t_bash_ver = env!("COMPAT_TARGET_BASH_VERSION");
         let vparts = version.split('.').collect();
-        let versinfo = [vparts, vec![symbol, profile, &machtype]]
+        let tbvparts = t_bash_ver.split('.').collect();
+        let sush_versinfo = [vparts, vec![symbol, profile, &machtype]]
+            .concat()
+            .iter()
+            .map(|e| e.to_string())
+            .collect();
+        let bash_versinfo = [tbvparts, vec![t_bash_symbol, profile, &machtype]]
             .concat()
             .iter()
             .map(|e| e.to_string())
             .collect();
 
         let _ = self.db.set_param(
-            "BASH_VERSION",
+            "SUSH_VERSION",
             &format!("{version}({symbol})-{profile}"),
             None,
         );
+        let _ = self.db.set_param(
+            "BASH_VERSION",
+            &format!("{t_bash_ver}({t_bash_symbol})-{profile}"),
+            None,
+        );
         let _ = self.db.set_param("MACHTYPE", &machtype, None);
         let _ = self.db.set_param("HOSTTYPE", t_arch, None);
         let _ = self.db.set_param("OSTYPE", t_os, None);
-        let _ = self.db.set_array("BASH_VERSINFO", Some(versinfo), None);
+        let _ = self
+            .db
+            .set_array("SUSH_VERSINFO", Some(sush_versinfo), None);
+        let _ = self
+            .db
+            .set_array("BASH_VERSINFO", Some(bash_versinfo), None);
+        self.db.set_flag("SUSH_VERSINFO", 'r', None);
         self.db.set_flag("BASH_VERSINFO", 'r', None);
     }
 

src/core/builtins/alias.rs

@@ -4,9 +4,8 @@
 use crate::ShellCore;
 
 pub fn alias(core: &mut ShellCore, args: &[String]) -> i32 {
-    if args.len() == 1 
-    || args.len() == 2 && args[1] == "-p" {
-        if ! core.shopts.query("expand_aliases") {
+    if args.len() == 1 || args.len() == 2 && args[1] == "-p" {
+        if !core.shopts.query("expand_aliases") {
             return 0;
         }
         for k in &core.db.get_indexes_all("BASH_ALIASES") {
@@ -24,8 +23,7 @@ pub fn alias(core: &mut ShellCore, args: &[String]) -> i32 {
         return 0;
     }
 
-    if args.len() == 2
-        && core.db.has_array_value("BASH_ALIASES", &args[1]) {
+    if args.len() == 2 && core.db.has_array_value("BASH_ALIASES", &args[1]) {
         let alias = core.db.get_elem("BASH_ALIASES", &args[1]).unwrap();
         println!("alias {}='{}'", &args[1], &alias);
         return 0;

src/core/builtins/command.rs

@@ -4,7 +4,7 @@
 use crate::elements::command::simple::SimpleCommand;
 use crate::elements::io::pipe::Pipe;
 use crate::utils::{arg, file};
-use crate::{error, file_check, proc_ctrl, ShellCore, utils};
+use crate::{error, file_check, proc_ctrl, utils, ShellCore};
 
 pub fn builtin(core: &mut ShellCore, args: &[String]) -> i32 {
     if args.len() <= 1 {
@@ -53,7 +53,7 @@ fn command_v(words: &[String], core: &mut ShellCore, large_v: bool) -> i32 {
                 true => {
                     println!("{} is a function", &com);
                     core.db.functions.get_mut(com).unwrap().pretty_print(0);
-                },
+                }
                 false => println!("{}", &com),
             }
         } else if let Some(path) = file::search_command(com) {

src/core/builtins/option.rs

@@ -151,7 +151,7 @@ pub fn set(core: &mut ShellCore, args: &[String]) -> i32 {
         if let Err(e) = set_positions(core, &args) {
             e.print(core);
             return 2;
-        }else{
+        } else {
             return 0;
         }
     }

src/core/builtins/parameter.rs

@@ -71,14 +71,12 @@ fn set_substitution(
     }
 
     /* TODO: chaos!!!! */
-    let treat_as_array = core.db.is_array(&sub.left_hand.name)
-                         || core.db.is_assoc(&sub.left_hand.name);
-    let option_indicate_array = arg::has_option("-A", args)
-                         || arg::has_option("-a", args);
-    let treat_as_export = core.db.has_flag(&sub.left_hand.name, 'x')
-                         || export_opt;
-    let subs_elem_quoted_string = sub.left_hand.index.is_some()
-                         && sub.right_hand.text.starts_with("'");
+    let treat_as_array =
+        core.db.is_array(&sub.left_hand.name) || core.db.is_assoc(&sub.left_hand.name);
+    let option_indicate_array = arg::has_option("-A", args) || arg::has_option("-a", args);
+    let treat_as_export = core.db.has_flag(&sub.left_hand.name, 'x') || export_opt;
+    let subs_elem_quoted_string =
+        sub.left_hand.index.is_some() && sub.right_hand.text.starts_with("'");
 
     if option_indicate_array {
         sub.quoted = false;

src/core/builtins/type_.rs

@@ -6,8 +6,7 @@ use crate::utils::{arg, file};
 use crate::{file_check, utils, ShellCore};
 
 fn type_no_opt_sub(core: &mut ShellCore, com: &String) -> i32 {
-    if core.shopts.query("expand_aliases") 
-    && core.db.has_array_value("BASH_ALIASES", com) {
+    if core.shopts.query("expand_aliases") && core.db.has_array_value("BASH_ALIASES", com) {
         let alias = core.db.get_elem("BASH_ALIASES", com).unwrap();
         println!("{} is aliased to `{}'", &com, &alias);
         return 0;
@@ -37,7 +36,7 @@ fn type_no_opt_sub(core: &mut ShellCore, com: &String) -> i32 {
     }
 
     let s = format!("{}: not found", &com);
-    return super::error_exit(1, "type", &s, core);
+    super::error_exit(1, "type", &s, core)
 }
 
 fn type_no_opt(core: &mut ShellCore, args: &[String]) -> i32 {
@@ -63,8 +62,7 @@ fn type_t(core: &mut ShellCore, args: &[String]) -> i32 {
 }
 
 fn type_t_sub(core: &mut ShellCore, com: &String) -> i32 {
-    if core.shopts.query("expand_aliases") 
-    && core.db.has_array_value("BASH_ALIASES", com) {
+    if core.shopts.query("expand_aliases") && core.db.has_array_value("BASH_ALIASES", com) {
         println!("alias");
         return 0;
     }
@@ -119,8 +117,8 @@ fn type_p_sub(core: &mut ShellCore, com: &String) -> i32 {
         return 0;
     }
 
-    if let Ok(path) = core.db.get_elem("BASH_CMDS", &com) {
-        if ! path.is_empty() {
+    if let Ok(path) = core.db.get_elem("BASH_CMDS", com) {
+        if !path.is_empty() {
             println!("{}", &path);
             return 0;
         }
@@ -155,7 +153,7 @@ fn type_large_p_sub(core: &mut ShellCore, com: &String) -> i32 {
         println!("{com}");
         return 0;
     }
-            
+
     es
 }
 

src/core/database/database_getter.rs

@@ -258,4 +258,3 @@ pub fn position_param(db: &DataBase, pos: usize) -> Result<String, ExecError> {
         false => Ok(String::new()),
     }
 }
-