ccstatusline-usage 2.0.38 → 2.0.40

package/dist/ccstatusline.js

@@ -51450,7 +51450,7 @@ import { execSync as execSync3 } from "child_process";
 import * as fs5 from "fs";
 import * as path4 from "path";
 var __dirname = "/Users/peter/Documents/Code/ccstatusline-usage/src/utils";
-var PACKAGE_VERSION = "2.0.38";
+var PACKAGE_VERSION = "2.0.40";
 function getPackageVersion() {
   if (/^\d+\.\d+\.\d+/.test(PACKAGE_VERSION)) {
     return PACKAGE_VERSION;
@@ -54487,49 +54487,99 @@ class ClaudeSessionIdWidget {
   }
 }
 // src/widgets/ApiUsage.tsx
-import { execSync as execSync8, spawnSync } from "child_process";
+import {
+  execSync as execSync8,
+  spawnSync
+} from "child_process";
 import * as fs7 from "fs";
 import * as path6 from "path";
 var CACHE_FILE = path6.join(process.env.HOME ?? "", ".cache", "ccstatusline-api.json");
+var LOCK_FILE = path6.join(process.env.HOME ?? "", ".cache", "ccstatusline-api.lock");
 var CACHE_MAX_AGE = 180;
+var LOCK_MAX_AGE = 30;
+var TOKEN_CACHE_MAX_AGE = 3600;
 var cachedData = null;
 var cacheTime = 0;
+var cachedToken = null;
+var tokenCacheTime = 0;
 function getToken() {
+  const now = Math.floor(Date.now() / 1000);
+  if (cachedToken && now - tokenCacheTime < TOKEN_CACHE_MAX_AGE) {
+    return cachedToken;
+  }
   try {
     const isMac = process.platform === "darwin";
     if (isMac) {
       const result = execSync8('security find-generic-password -s "Claude Code-credentials" -w 2>/dev/null', { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }).trim();
       const parsed = JSON.parse(result);
-      return parsed?.claudeAiOauth?.accessToken ?? null;
+      const token = parsed?.claudeAiOauth?.accessToken ?? null;
+      if (token) {
+        cachedToken = token;
+        tokenCacheTime = now;
+      }
+      return token;
     } else {
       const credFile = path6.join(process.env.HOME ?? "", ".claude", ".credentials.json");
-      if (fs7.existsSync(credFile)) {
-        const creds = JSON.parse(fs7.readFileSync(credFile, "utf8"));
-        return creds?.claudeAiOauth?.accessToken ?? null;
+      const creds = JSON.parse(fs7.readFileSync(credFile, "utf8"));
+      const token = creds?.claudeAiOauth?.accessToken ?? null;
+      if (token) {
+        cachedToken = token;
+        tokenCacheTime = now;
       }
+      return token;
     }
-  } catch {}
-  return null;
+  } catch {
+    return null;
+  }
+}
+function readStaleCache() {
+  try {
+    return JSON.parse(fs7.readFileSync(CACHE_FILE, "utf8"));
+  } catch {
+    return null;
+  }
 }
 function fetchApiData() {
   const now = Math.floor(Date.now() / 1000);
-  if (cachedData && now - cacheTime < CACHE_MAX_AGE) {
+  if (cachedData && !cachedData.error && now - cacheTime < CACHE_MAX_AGE) {
     return cachedData;
   }
   try {
-    if (fs7.existsSync(CACHE_FILE)) {
-      const stat = fs7.statSync(CACHE_FILE);
-      const fileAge = now - Math.floor(stat.mtimeMs / 1000);
-      if (fileAge < CACHE_MAX_AGE) {
-        cachedData = JSON.parse(fs7.readFileSync(CACHE_FILE, "utf8"));
+    const stat = fs7.statSync(CACHE_FILE);
+    const fileAge = now - Math.floor(stat.mtimeMs / 1000);
+    if (fileAge < CACHE_MAX_AGE) {
+      const fileData = JSON.parse(fs7.readFileSync(CACHE_FILE, "utf8"));
+      if (!fileData.error) {
+        cachedData = fileData;
         cacheTime = now;
-        return cachedData;
+        return fileData;
       }
     }
   } catch {}
+  try {
+    const lockStat = fs7.statSync(LOCK_FILE);
+    const lockAge = now - Math.floor(lockStat.mtimeMs / 1000);
+    if (lockAge < LOCK_MAX_AGE) {
+      const stale = readStaleCache();
+      if (stale && !stale.error)
+        return stale;
+      return { error: "timeout" };
+    }
+  } catch {}
+  try {
+    const lockDir = path6.dirname(LOCK_FILE);
+    if (!fs7.existsSync(lockDir)) {
+      fs7.mkdirSync(lockDir, { recursive: true });
+    }
+    fs7.writeFileSync(LOCK_FILE, "");
+  } catch {}
   const token = getToken();
-  if (!token)
-    return null;
+  if (!token) {
+    const stale = readStaleCache();
+    if (stale && !stale.error)
+      return stale;
+    return { error: "no-credentials" };
+  }
   try {
     const curlResult = spawnSync("curl", [
       "-s",
@@ -54540,12 +54590,15 @@ function fetchApiData() {
       `Authorization: Bearer ${token}`,
       "-H",
       "anthropic-beta: oauth-2025-04-20"
-    ], { encoding: "utf8", timeout: 5000 });
-    if (curlResult.error || curlResult.status !== 0)
-      return null;
-    const result = curlResult.stdout;
-    const data = JSON.parse(result);
-    let apiData = {};
+    ], { encoding: "utf8", timeout: 6000 });
+    if (curlResult.error || curlResult.status !== 0 || !curlResult.stdout) {
+      const stale = readStaleCache();
+      if (stale && !stale.error)
+        return stale;
+      return { error: "api-error" };
+    }
+    const data = JSON.parse(curlResult.stdout);
+    const apiData = {};
     if (data.five_hour) {
       apiData.sessionUsage = data.five_hour.utilization;
       apiData.sessionResetAt = data.five_hour.reset_at;
@@ -54553,6 +54606,12 @@ function fetchApiData() {
     if (data.seven_day) {
       apiData.weeklyUsage = data.seven_day.utilization;
     }
+    if (apiData.sessionUsage === undefined && apiData.weeklyUsage === undefined) {
+      const stale = readStaleCache();
+      if (stale && !stale.error)
+        return stale;
+      return { error: "parse-error" };
+    }
     try {
       const cacheDir = path6.dirname(CACHE_FILE);
       if (!fs7.existsSync(cacheDir)) {
@@ -54564,7 +54623,22 @@ function fetchApiData() {
     cacheTime = now;
     return apiData;
   } catch {
-    return null;
+    const stale = readStaleCache();
+    if (stale && !stale.error)
+      return stale;
+    return { error: "parse-error" };
+  }
+}
+function getErrorMessage(error43) {
+  switch (error43) {
+    case "no-credentials":
+      return "[No credentials]";
+    case "timeout":
+      return "[Timeout]";
+    case "api-error":
+      return "[API Error]";
+    case "parse-error":
+      return "[Parse Error]";
   }
 }
 function makeProgressBar(percent, width = 15) {
@@ -54583,23 +54657,24 @@ class SessionUsageWidget {
   getDisplayName() {
     return "Session Usage";
   }
-  getEditorDisplay() {
+  getEditorDisplay(item) {
     return { displayText: this.getDisplayName() };
   }
-  render(item, context) {
+  render(item, context, settings) {
     if (context.isPreview)
       return "Session: [███░░░░░░░░░░░░] 20%";
     const data = fetchApiData();
-    if (!data || data.sessionUsage === undefined) {
+    if (data.error)
+      return getErrorMessage(data.error);
+    if (data.sessionUsage === undefined)
       return null;
-    }
     const percent = data.sessionUsage;
     return `Session: ${makeProgressBar(percent)} ${percent.toFixed(1)}%`;
   }
   supportsRawValue() {
     return false;
   }
-  supportsColors() {
+  supportsColors(item) {
     return true;
   }
 }
@@ -54614,23 +54689,24 @@ class WeeklyUsageWidget {
   getDisplayName() {
     return "Weekly Usage";
   }
-  getEditorDisplay() {
+  getEditorDisplay(item) {
     return { displayText: this.getDisplayName() };
   }
-  render(item, context) {
+  render(item, context, settings) {
     if (context.isPreview)
       return "Weekly: [██░░░░░░░░░░░░░] 12%";
     const data = fetchApiData();
-    if (!data || data.weeklyUsage === undefined) {
+    if (data.error)
+      return getErrorMessage(data.error);
+    if (data.weeklyUsage === undefined)
       return null;
-    }
     const percent = data.weeklyUsage;
     return `Weekly: ${makeProgressBar(percent)} ${percent.toFixed(1)}%`;
   }
   supportsRawValue() {
     return false;
   }
-  supportsColors() {
+  supportsColors(item) {
     return true;
   }
 }
@@ -54645,16 +54721,17 @@ class ResetTimerWidget {
   getDisplayName() {
     return "Reset Timer";
   }
-  getEditorDisplay() {
+  getEditorDisplay(item) {
     return { displayText: this.getDisplayName() };
   }
-  render(item, context) {
+  render(item, context, settings) {
     if (context.isPreview)
       return "4:30 hr";
     const data = fetchApiData();
-    if (!data || !data.sessionResetAt) {
+    if (data.error)
+      return getErrorMessage(data.error);
+    if (!data.sessionResetAt)
       return null;
-    }
     try {
       const resetTime = new Date(data.sessionResetAt).getTime();
       const now = Date.now();
@@ -54671,7 +54748,7 @@ class ResetTimerWidget {
   supportsRawValue() {
     return false;
   }
-  supportsColors() {
+  supportsColors(item) {
     return true;
   }
 }
@@ -54686,10 +54763,10 @@ class ContextBarWidget {
   getDisplayName() {
     return "Context Bar";
   }
-  getEditorDisplay() {
+  getEditorDisplay(item) {
     return { displayText: this.getDisplayName() };
   }
-  render(item, context) {
+  render(item, context, settings) {
     if (context.isPreview)
       return "Context: [████░░░░░░░░░░░] 50k/200k (25%)";
     const cw = context.data?.context_window;
@@ -54713,7 +54790,7 @@ class ContextBarWidget {
   supportsRawValue() {
     return false;
   }
-  supportsColors() {
+  supportsColors(item) {
     return true;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccstatusline-usage",
-  "version": "2.0.38",
+  "version": "2.0.40",
   "description": "A customizable status line formatter for Claude Code CLI",
   "module": "src/ccstatusline.ts",
   "type": "module",
@@ -8,11 +8,7 @@
     "ccstatusline": "dist/ccstatusline.js"
   },
   "files": [
-    "dist/",
-    "scripts/usage.sh",
-    "scripts/context.sh",
-    "scripts/setup-enhanced.sh",
-    "defaults/"
+    "dist/"
   ],
   "scripts": {
     "start": "bun run src/ccstatusline.ts",

package/defaults/settings-enhanced.json

@@ -1,73 +0,0 @@
-{
-  "version": 3,
-  "lines": [
-    [
-      {
-        "id": "session-usage",
-        "type": "custom-command",
-        "color": "brightBlue",
-        "commandPath": "scripts/usage.sh session"
-      },
-      {
-        "id": "sep-session-weekly",
-        "type": "separator"
-      },
-      {
-        "id": "weekly-usage",
-        "type": "custom-command",
-        "color": "brightBlue",
-        "commandPath": "scripts/usage.sh weekly"
-      },
-      {
-        "id": "sep-weekly-reset",
-        "type": "separator"
-      },
-      {
-        "id": "reset-timer",
-        "type": "custom-command",
-        "color": "brightBlue",
-        "commandPath": "scripts/usage.sh reset"
-      },
-      {
-        "id": "sep-reset-model",
-        "type": "separator"
-      },
-      {
-        "id": "model",
-        "type": "model",
-        "color": "magenta"
-      },
-      {
-        "id": "sep-model-chatid",
-        "type": "separator"
-      },
-      {
-        "id": "chat-id",
-        "type": "claude-session-id",
-        "color": "cyan"
-      }
-    ],
-    [
-      {
-        "id": "context-usage",
-        "type": "custom-command",
-        "color": "blue",
-        "commandPath": "scripts/context.sh"
-      }
-    ],
-    []
-  ],
-  "flexMode": "full-minus-40",
-  "compactThreshold": 60,
-  "colorLevel": 2,
-  "inheritSeparatorColors": false,
-  "globalBold": false,
-  "powerline": {
-    "enabled": false,
-    "separators": [""],
-    "separatorInvertBackground": [false],
-    "startCaps": [],
-    "endCaps": [],
-    "autoAlign": false
-  }
-}

package/scripts/context.sh

@@ -1,58 +0,0 @@
-#!/bin/bash
-
-CACHE_FILE="$HOME/.claude/.statusline/context.json"
-
-make_bar() {
-  local pct="$1"
-  local width=15
-  local filled=$((pct * width / 100))
-  local empty=$((width - filled))
-  printf "["
-  printf "█%.0s" $(seq 1 "$filled")
-  printf "░%.0s" $(seq 1 "$empty")
-  printf "]"
-}
-
-format_tokens() {
-  local tokens="$1"
-  if [[ $tokens -ge 1000 ]]; then
-    echo "$((tokens / 1000))k"
-  else
-    echo "$tokens"
-  fi
-}
-
-if [[ ! -f "$CACHE_FILE" ]]; then
-  BAR=$(make_bar 0)
-  echo "Context: $BAR 0k/200k (0%)"
-  exit 0
-fi
-
-INPUT=$(cat "$CACHE_FILE")
-
-MAX_TOKENS=$(echo "$INPUT" | jq -r '.context_window_size // empty')
-CURRENT_USAGE=$(echo "$INPUT" | jq -r '.current_usage // empty')
-
-if [[ -z "$MAX_TOKENS" || "$MAX_TOKENS" == "null" || -z "$CURRENT_USAGE" || "$CURRENT_USAGE" == "null" ]]; then
-  BAR=$(make_bar 0)
-  echo "Context: $BAR 0k/200k (0%)"
-  exit 0
-fi
-
-INPUT_TOKENS=$(echo "$INPUT" | jq -r '.current_usage.input_tokens // 0')
-CACHE_CREATE=$(echo "$INPUT" | jq -r '.current_usage.cache_creation_input_tokens // 0')
-CACHE_READ=$(echo "$INPUT" | jq -r '.current_usage.cache_read_input_tokens // 0')
-
-CURRENT_TOKENS=$((INPUT_TOKENS + CACHE_CREATE + CACHE_READ))
-
-if [[ $MAX_TOKENS -gt 0 ]]; then
-  PERCENT=$((CURRENT_TOKENS * 100 / MAX_TOKENS))
-else
-  PERCENT=0
-fi
-
-CURRENT_FMT=$(format_tokens "$CURRENT_TOKENS")
-MAX_FMT=$(format_tokens "$MAX_TOKENS")
-BAR=$(make_bar "$PERCENT")
-
-echo "Context: $BAR ${CURRENT_FMT}/${MAX_FMT} (${PERCENT}%)"

package/scripts/setup-enhanced.sh

@@ -1,98 +0,0 @@
-#!/bin/bash
-# Setup script for ccstatusline-usage enhanced configuration
-# Installs usage scripts and applies enhanced settings
-
-set -euo pipefail
-
-SCRIPT_DIR="$HOME/.local/share/ccstatusline"
-CONFIG_DIR="$HOME/.config/ccstatusline"
-SETTINGS_FILE="$CONFIG_DIR/settings.json"
-
-# Find the package directory (where this script is located)
-PKG_DIR="$(cd "$(dirname "$0")/.." && pwd)"
-
-echo "Setting up ccstatusline-usage enhanced configuration..."
-
-# Create directories
-mkdir -p "$SCRIPT_DIR"
-mkdir -p "$CONFIG_DIR"
-
-# Copy scripts
-if [[ -f "$PKG_DIR/scripts/usage.sh" ]]; then
-    cp "$PKG_DIR/scripts/usage.sh" "$SCRIPT_DIR/"
-    chmod +x "$SCRIPT_DIR/usage.sh"
-    echo "✓ Installed usage.sh to $SCRIPT_DIR/"
-else
-    echo "✗ usage.sh not found in package"
-    exit 1
-fi
-
-if [[ -f "$PKG_DIR/scripts/context.sh" ]]; then
-    cp "$PKG_DIR/scripts/context.sh" "$SCRIPT_DIR/"
-    chmod +x "$SCRIPT_DIR/context.sh"
-    echo "✓ Installed context.sh to $SCRIPT_DIR/"
-else
-    echo "✗ context.sh not found in package"
-    exit 1
-fi
-
-# Create enhanced settings with correct paths
-cat > "$SETTINGS_FILE" << 'EOF'
-{
-  "version": 3,
-  "lines": [
-    [
-      {
-        "id": "session-usage",
-        "type": "custom-command",
-        "color": "brightBlue",
-        "commandPath": "$HOME/.local/share/ccstatusline/usage.sh session",
-        "timeout": 5000
-      },
-      {"id": "sep1", "type": "separator"},
-      {
-        "id": "weekly-usage",
-        "type": "custom-command",
-        "color": "brightBlue",
-        "commandPath": "$HOME/.local/share/ccstatusline/usage.sh weekly",
-        "timeout": 5000
-      },
-      {"id": "sep2", "type": "separator"},
-      {
-        "id": "reset-timer",
-        "type": "custom-command",
-        "color": "brightBlue",
-        "commandPath": "$HOME/.local/share/ccstatusline/usage.sh reset",
-        "timeout": 5000
-      },
-      {"id": "sep3", "type": "separator"},
-      {"id": "model", "type": "model", "color": "magenta"},
-      {"id": "sep4", "type": "separator"},
-      {"id": "session-id", "type": "claude-session-id", "color": "cyan"}
-    ],
-    [
-      {
-        "id": "context-usage",
-        "type": "custom-command",
-        "color": "blue",
-        "commandPath": "$HOME/.local/share/ccstatusline/context.sh",
-        "timeout": 5000
-      }
-    ],
-    []
-  ],
-  "flexMode": "full-minus-40",
-  "compactThreshold": 60,
-  "colorLevel": 2
-}
-EOF
-
-# Expand $HOME in the settings file
-sed -i.bak "s|\$HOME|$HOME|g" "$SETTINGS_FILE" && rm -f "$SETTINGS_FILE.bak"
-
-echo "✓ Created enhanced settings at $SETTINGS_FILE"
-echo ""
-echo "Setup complete! Run 'npx ccstatusline-usage' to configure."
-echo ""
-echo "Note: The usage widgets require Anthropic API access."
-echo "Make sure you have valid credentials in ~/.claude/credentials.json"

package/scripts/usage.sh

@@ -1,147 +0,0 @@
-#!/bin/bash
-
-# Cross-platform usage script for ccstatusline-usage
-# Works on both macOS and Linux
-
-CACHE_FILE="$HOME/.cache/ccstatusline-api.json"
-LOCK_FILE="$HOME/.cache/ccstatusline-api.lock"
-
-# Detect OS for platform-specific commands
-is_macos() {
-  [[ "$(uname)" == "Darwin" ]]
-}
-
-# Get file modification time (seconds since epoch)
-get_mtime() {
-  if is_macos; then
-    stat -f '%m' "$1" 2>/dev/null
-  else
-    stat -c '%Y' "$1" 2>/dev/null
-  fi
-}
-
-# Get OAuth token from credentials
-get_token() {
-  if is_macos; then
-    # macOS: read from keychain
-    security find-generic-password -s "Claude Code-credentials" -w 2>/dev/null | jq -r '.claudeAiOauth.accessToken // empty'
-  else
-    # Linux: read from credentials file
-    jq -r '.claudeAiOauth.accessToken // empty' ~/.claude/.credentials.json 2>/dev/null
-  fi
-}
-
-# Parse ISO date to epoch
-parse_iso_date() {
-  local iso_date="$1"
-  # Remove fractional seconds and Z suffix
-  local clean_date="${iso_date%%.*}"
-  clean_date="${clean_date%%Z}"
-
-  if is_macos; then
-    TZ=UTC date -j -f "%Y-%m-%dT%H:%M:%S" "$clean_date" "+%s" 2>/dev/null
-  else
-    # Linux: use date -d with ISO format
-    date -d "$clean_date" "+%s" 2>/dev/null
-  fi
-}
-
-fetch_api() {
-  local NOW=$(date +%s)
-
-  # Use cache if < 180 seconds old
-  if [[ -f "$CACHE_FILE" ]]; then
-    local MTIME=$(get_mtime "$CACHE_FILE")
-    if [[ -n "$MTIME" ]]; then
-      local CACHE_AGE=$((NOW - MTIME))
-      [[ $CACHE_AGE -lt 180 ]] && return 0
-    fi
-  fi
-
-  # Rate limit: only try API once per 30 seconds
-  if [[ -f "$LOCK_FILE" ]]; then
-    local LOCK_MTIME=$(get_mtime "$LOCK_FILE")
-    if [[ -n "$LOCK_MTIME" ]]; then
-      local LOCK_AGE=$((NOW - LOCK_MTIME))
-      if [[ $LOCK_AGE -lt 30 ]]; then
-        [[ -f "$CACHE_FILE" ]] && return 0
-        return 1
-      fi
-    fi
-  fi
-
-  touch "$LOCK_FILE"
-
-  TOKEN=$(get_token)
-  [[ -z "$TOKEN" ]] && return 1
-
-  RESPONSE=$(curl -s --max-time 5 "https://api.anthropic.com/api/oauth/usage" \
-    -H "Authorization: Bearer $TOKEN" \
-    -H "anthropic-beta: oauth-2025-04-20" 2>/dev/null)
-  [[ -z "$RESPONSE" ]] && return 1
-
-  # Ensure cache directory exists
-  mkdir -p "$(dirname "$CACHE_FILE")"
-  echo "$RESPONSE" > "$CACHE_FILE"
-  return 0
-}
-
-make_bar() {
-  local pct="$1"
-  local width=15
-  local filled=$((pct * width / 100))
-  local empty=$((width - filled))
-  printf "["
-  printf "█%.0s" $(seq 1 "$filled")
-  printf "░%.0s" $(seq 1 "$empty")
-  printf "]"
-}
-
-MODE="${1:-all}"
-
-fetch_api || { echo "[API Error]"; exit 1; }
-
-case "$MODE" in
-  session)
-    SESSION=$(jq -r '.five_hour.utilization // empty' "$CACHE_FILE" 2>/dev/null)
-    [[ -z "$SESSION" ]] && { echo "[Parse Error]"; exit 1; }
-    SESSION_INT=${SESSION%.*}
-    SESSION_BAR=$(make_bar "$SESSION_INT")
-    echo "Session: $SESSION_BAR ${SESSION}%"
-    ;;
-  weekly)
-    WEEKLY=$(jq -r '.seven_day.utilization // empty' "$CACHE_FILE" 2>/dev/null)
-    [[ -z "$WEEKLY" ]] && { echo "[Parse Error]"; exit 1; }
-    WEEKLY_INT=${WEEKLY%.*}
-    WEEKLY_BAR=$(make_bar "$WEEKLY_INT")
-    echo "Weekly: $WEEKLY_BAR ${WEEKLY}%"
-    ;;
-  reset)
-    RESETS_AT=$(jq -r '.five_hour.resets_at // empty' "$CACHE_FILE" 2>/dev/null)
-    [[ -z "$RESETS_AT" ]] && { echo "[Parse Error]"; exit 1; }
-    RESET_EPOCH=$(parse_iso_date "$RESETS_AT")
-    NOW_EPOCH=$(date -u +%s)
-    if [[ -z "$RESET_EPOCH" ]]; then
-      echo "[Date Error]"
-      exit 1
-    fi
-    DIFF=$((RESET_EPOCH - NOW_EPOCH))
-    if [[ $DIFF -le 0 ]]; then
-      echo "Reset now"
-    else
-      HOURS=$((DIFF / 3600))
-      MINUTES=$(((DIFF % 3600) / 60))
-      echo "${HOURS}:$(printf '%02d' $MINUTES) hr"
-    fi
-    ;;
-  *)
-    SESSION=$(jq -r '.five_hour.utilization // empty' "$CACHE_FILE" 2>/dev/null)
-    WEEKLY=$(jq -r '.seven_day.utilization // empty' "$CACHE_FILE" 2>/dev/null)
-    [[ -z "$SESSION" || -z "$WEEKLY" ]] && { echo "[Parse Error]"; exit 1; }
-    SESSION_INT=${SESSION%.*}
-    WEEKLY_INT=${WEEKLY%.*}
-    SESSION_BAR=$(make_bar "$SESSION_INT")
-    WEEKLY_BAR=$(make_bar "$WEEKLY_INT")
-    echo "Session: $SESSION_BAR ${SESSION}% | Weekly: $WEEKLY_BAR ${WEEKLY}%"
-    ;;
-esac